diff --git a/psaw/PushshiftAPI.py b/psaw/PushshiftAPI.py
index c12d3d6..8699e6c 100644
--- a/psaw/PushshiftAPI.py
+++ b/psaw/PushshiftAPI.py
@@ -212,10 +212,18 @@ def _handle_paging(self, url):
                     raise NotImplementedError(err_msg.format(self.max_results_per_request))
             self._add_nec_args(self.payload)
 
-            yield self._get(url, self.payload)
-
-            if (limit is not None) & (limit == 0):
-                return
+            data = self._get(url, self.payload)
+            yield data
+            if limit is not None:
+                received_size = int(data['metadata']['size'])
+                requested_size = self.payload['limit']
+                # The API can decide to send less data than desired.
+                # We need to send another request in that case requesting the missing amount
+                if received_size < requested_size:
+                    limit += requested_size - received_size
+
+                if limit == 0:
+                    return
 
     def _search(self,
                 kind,