diff --git a/internal/api/status/query.go b/internal/api/status/query.go
index 809ff7f..16f0f01 100644
--- a/internal/api/status/query.go
+++ b/internal/api/status/query.go
@@ -45,16 +45,12 @@ func (h *handler) Query(c *gin.Context) {
 		return
 	}
 
-	if req.Pid == 0 && req.Uid == 0 {
-		e.Pong[any](c, e.InvalidParameter, nil)
-		return
-	}
-
-	submissions, status := h.submissionService.Query(req.Pid, req.Uid, req.Offset, req.Limit)
-
 	uid := claim.(*model.Claim).UID
 	role := claim.(*model.Claim).Role
-	var response []*queryResponse
+
+	if req.Pid == 0 && req.Uid == 0 {
+		req.Uid = uid
+	}
 
 	var count int64
 	submissions, status := h.submissionService.Query(req.Pid, req.Uid, req.Offset, req.Limit, &count)