diff --git a/src/LearnositySdk/Request/DataApi.php b/src/LearnositySdk/Request/DataApi.php
index <HASH>..<HASH> 100644
--- a/src/LearnositySdk/Request/DataApi.php
+++ b/src/LearnositySdk/Request/DataApi.php
@@ -76,10 +76,12 @@ class DataApi
             } else {
                 throw new Exception(Json::encode($data));
             }
-            if (array_key_exists('next', $data['meta'])) {
+            if (array_key_exists('next', $data['meta']) && !empty($data['data'])) {
                 $requestPacket['next'] = $data['meta']['next'];
+            } else {
+                unset($requestPacket['next']);
             }
-        } while (array_key_exists('next', $data['meta']));
+        } while (array_key_exists('next', $requestPacket));
 
         return $response;
     }
Fixed endless loop due to the new next token, only request recursive if data is not empty