diff --git a/src/controllers/07-task-controller.ts b/src/controllers/07-task-controller.ts
index 28b65cf..ff8e981 100644
--- a/src/controllers/07-task-controller.ts
+++ b/src/controllers/07-task-controller.ts
@@ -725,16 +725,16 @@ export class UserTaskController extends Controller {
       },
       userTask: userTaskStatus
         ? {
-            some:
-              userTaskStatus !== UserTaskStatus.Pending && userTaskStatus !== UserTaskStatus.Restart
-                ? {
-                    userTaskStatus,
-                    userId: req.user.sub,
-                  }
-                : undefined,
+            some: {
+              userTaskStatus:
+                userTaskStatus === UserTaskStatus.Pending
+                  ? { in: [UserTaskStatus.Pending, UserTaskStatus.Restart] }
+                  : userTaskStatus,
+              userId: req.user.sub,
+            },
             none:
-              userTaskStatus === UserTaskStatus.Pending || userTaskStatus === UserTaskStatus.Restart
-                ? { userId: req.user.sub }
+              userTaskStatus === UserTaskStatus.Pending
+                ? { userId: req.user.sub, userTaskStatus: { not: UserTaskStatus.Restart } }
                 : undefined,
           }
         : undefined,