diff --git a/apps/api/plane/tests/unit/utils/test_paginator.py b/apps/api/plane/tests/unit/utils/test_paginator.py
index 623a71f893..cb67b07c60 100644
--- a/apps/api/plane/tests/unit/utils/test_paginator.py
+++ b/apps/api/plane/tests/unit/utils/test_paginator.py
@@ -176,8 +176,9 @@ class TestCursorBounds:
 
 
 @pytest.mark.unit
-class TestGetPerPageNegativeRejected:
-    """A negative per_page must be rejected, not just a too-large one.
+class TestGetPerPageNonPositiveRejected:
+    """A non-positive per_page (negative or zero) must be rejected, not just a
+    too-large one.
 
     OffsetPaginator.get_result() slices the queryset with
     queryset[offset : offset + limit]; get_per_page() previously only checked
@@ -186,16 +187,21 @@ class TestGetPerPageNegativeRejected:
     unhandled "Negative indexing is not supported" -> HTTP 500. This is the same
     crash class TestCursorBounds closes for the cursor-driven grouped paginators,
     reachable here on every non-grouped paginated endpoint via a plain query
-    param."""
+    param.
 
-    @pytest.mark.parametrize("per_page", [-1, -50, -1000])
-    def test_negative_per_page_rejected_by_get_per_page(self, per_page):
+    A per_page of exactly 0 has the same failure mode: it reaches
+    OffsetPaginator.get_result() with limit=0, where math.ceil(count / limit)
+    raises an unhandled ZeroDivisionError -> HTTP 500."""
+
+    @pytest.mark.parametrize("per_page", [-1, -50, -1000, 0])
+    def test_non_positive_per_page_rejected_by_get_per_page(self, per_page):
         request = _make_request(per_page=str(per_page))
         with pytest.raises(ParseError):
             BasePaginator().get_per_page(request, default_per_page=20, max_per_page=1000)
 
-    def test_negative_per_page_rejected_before_paginator_runs(self):
-        request = _make_request(per_page="-1")
+    @pytest.mark.parametrize("per_page", ["-1", "0"])
+    def test_non_positive_per_page_rejected_before_paginator_runs(self, per_page):
+        request = _make_request(per_page=per_page)
         with pytest.raises(ParseError):
             BasePaginator().paginate(
                 request=request,
@@ -204,9 +210,3 @@ class TestGetPerPageNegativeRejected:
                 default_per_page=20,
                 max_per_page=1000,
             )
-
-    def test_zero_per_page_is_still_allowed(self):
-        # 0 is a valid (if degenerate) page size, not a negative one — must not
-        # be rejected by this guard.
-        request = _make_request(per_page="0")
-        assert BasePaginator().get_per_page(request, default_per_page=20, max_per_page=1000) == 0
diff --git a/apps/api/plane/utils/paginator.py b/apps/api/plane/utils/paginator.py
index 63ae874d7a..21bb43f1a5 100644
--- a/apps/api/plane/utils/paginator.py
+++ b/apps/api/plane/utils/paginator.py
@@ -647,13 +647,16 @@ class BasePaginator:
             raise ParseError(detail="Invalid per_page parameter.")
 
         max_per_page = self._effective_max_per_page(max_per_page, default_per_page)
-        # A negative per_page reaches OffsetPaginator.get_result() unmodified and
-        # produces a negative slice bound (queryset[offset : offset + per_page]),
-        # which raises Django's unhandled "Negative indexing is not supported"
-        # (HTTP 500) — the same crash class the cursor-bound check below closes,
-        # just reachable on every paginated endpoint via a plain query param.
-        if per_page < 0:
-            raise ParseError(detail="Invalid per_page value. Cannot be negative.")
+        # A non-positive per_page reaches OffsetPaginator.get_result() unmodified.
+        # A negative value produces a negative slice bound
+        # (queryset[offset : offset + per_page]), which raises Django's unhandled
+        # "Negative indexing is not supported" (HTTP 500) — the same crash class
+        # the cursor-bound check below closes, just reachable on every paginated
+        # endpoint via a plain query param. A zero value reaches
+        # math.ceil(count / limit) with limit=0 and raises an unhandled
+        # ZeroDivisionError (HTTP 500) instead.
+        if per_page <= 0:
+            raise ParseError(detail="Invalid per_page value. Must be greater than zero.")
         if per_page > max_per_page:
             raise ParseError(detail=f"Invalid per_page value. Cannot exceed {max_per_page}.")