diff --git a/vmware_nsx_tempest_plugin/services/nsxv3_client.py b/vmware_nsx_tempest_plugin/services/nsxv3_client.py
index 6befb44..144b853 100644
--- a/vmware_nsx_tempest_plugin/services/nsxv3_client.py
+++ b/vmware_nsx_tempest_plugin/services/nsxv3_client.py
@@ -175,17 +175,14 @@ class NSXV3Client(object):
         results = []
         response = self.get(endpoint=endpoint)
         res_json = response.json()
-        if res_json.get("cursor"):
-            cursor = res_json.get("cursor")
-            if res_json.get("results"):
-                results.extend(res_json["results"])
-            while cursor:
-                page = self.get(endpoint=endpoint, cursor=cursor).json()
-                results.extend(page.get("results", []))
-                cursor = page.get("cursor")
-            return results
-        else:
-            return res_json
+        cursor = res_json.get("cursor")
+        if res_json.get("results"):
+            results.extend(res_json["results"])
+        while cursor:
+            page = self.get(endpoint=endpoint, cursor=cursor).json()
+            results.extend(page.get("results", []))
+            cursor = page.get("cursor")
+        return results
 
     def get_transport_zones(self):
         """