diff --git a/internal/codespaces/api/api.go b/internal/codespaces/api/api.go
index e3d856230..651d77d57 100644
--- a/internal/codespaces/api/api.go
+++ b/internal/codespaces/api/api.go
@@ -228,12 +228,11 @@ func (a *API) ListCodespaces(ctx context.Context) ([]*Codespace, error) {
 			return nil, fmt.Errorf("error unmarshaling response: %w", err)
 		}
 
-		if len(response.Codespaces) > 0 {
-			codespaces = append(codespaces, response.Codespaces...)
-			page++
-		} else {
-			break
+		if len(response.Codespaces) == 0 {
+		        break
 		}
+	        
+	        codespaces = append(codespaces, response.Codespaces...)
 	}
 
 	return codespaces, nil