diff --git a/gitea/gitea.py b/gitea/gitea.py
index 5358a13..38c4c0f 100644
--- a/gitea/gitea.py
+++ b/gitea/gitea.py
@@ -79,8 +79,6 @@ class Gitea:
         if sudo:
             combined_params["sudo"] = sudo.username
         request = self.requests.get(self.__get_url(endpoint), headers=self.headers, params=combined_params)
-        if request.status_code == 204:
-            return None
         if request.status_code not in [200, 201]:
             message = f"Received status code: {request.status_code} ({request.url})"
             if request.status_code in [404]:
@@ -100,10 +98,10 @@ class Gitea:
         while True:
             combined_params[page_key] = page
             result = self.requests_get(endpoint, combined_params, sudo)
+            if not result:
+                return aggregated_result
             aggregated_result.extend(result)
             page += 1
-            if len(result) == 0:
-                return aggregated_result
 
     def requests_put(self, endpoint: str):
         request = self.requests.put(self.__get_url(endpoint), headers=self.headers)
diff --git a/setup.py b/setup.py
index d5a286e..77249ff 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ with open('README.md') as readme_file:
 
 setup_args = dict(
     name='py-gitea',
-    version='0.2.2',
+    version='0.2.3',
     description='A python wrapper for the Gitea API',
     long_description_content_type="text/markdown",
     long_description=README,