diff --git a/watcher/common/nova_helper.py b/watcher/common/nova_helper.py
index 638ca7e0b..ca6408b92 100644
--- a/watcher/common/nova_helper.py
+++ b/watcher/common/nova_helper.py
@@ -74,7 +74,8 @@ class NovaHelper(object):
             raise exception.ComputeNodeNotFound(name=node_hostname)
 
     def get_instance_list(self):
-        return self.nova.servers.list(search_opts={'all_tenants': True})
+        return self.nova.servers.list(search_opts={'all_tenants': True},
+                                      limit=-1)
 
     def get_flavor_list(self):
         return self.nova.flavors.list(**{'is_public': None})
@@ -704,7 +705,8 @@ class NovaHelper(object):
 
     def get_instances_by_node(self, host):
         return [instance for instance in
-                self.nova.servers.list(search_opts={"all_tenants": True})
+                self.nova.servers.list(search_opts={"all_tenants": True},
+                                       limit=-1)
                 if self.get_hostname(instance) == host]
 
     def get_hostname(self, instance):