diff --git a/storage/task.go b/storage/task.go
index 393cd12..60ea3bb 100644
--- a/storage/task.go
+++ b/storage/task.go
@@ -129,9 +129,9 @@ func (database *Database) GetTaskFromProject(worker *Worker, projectId int64) *T
 
 	var id int64
 	err := row.Scan(&id)
+	database.assignMutex.Unlock()
 
 	if err != nil {
-		database.assignMutex.Unlock()
 		return nil
 	}
 
@@ -144,8 +144,6 @@ func (database *Database) GetTaskFromProject(worker *Worker, projectId int64) *T
 		  INNER JOIN project project ON task.project = project.id
 		WHERE task.id=$1`, id)
 
-	database.assignMutex.Unlock()
-
 	project := &Project{}
 	task := &Task{}
 	task.Project = project