diff --git a/disco/types/channel.py b/disco/types/channel.py
index 2419bec..ef0c17e 100644
--- a/disco/types/channel.py
+++ b/disco/types/channel.py
@@ -548,6 +548,9 @@ class MessageIterator(object):
         if not len(self._buffer):
             self.fill()
 
+        if not len(self._buffer):
+            raise StopIteration
+
         if self.bulk:
             res = self._buffer
             self._buffer = []