diff --git a/armada/handlers/tiller.py b/armada/handlers/tiller.py
index 0b8ac26b..407383e4 100644
--- a/armada/handlers/tiller.py
+++ b/armada/handlers/tiller.py
@@ -211,7 +211,9 @@ class Tiller(object):
                 response = stub.ListReleases(
                     req, self.timeout, metadata=self.metadata)
 
+                found_message = False
                 for message in response:
+                    found_message = True
                     page = message.releases
 
                     if initial_total:
@@ -232,6 +234,11 @@ class Tiller(object):
                     else:
                         done = True
 
+                # Ensure we break out was no message found which
+                # is seen if there are no releases in tiller.
+                if not found_message:
+                    done = True
+
             return releases
 
         for index in range(LIST_RELEASES_ATTEMPTS):