diff --git a/backend/src/main/java/net/beetechgroup/beetask/frameworks/persistence/mapper/ProjectEntityMapper.java b/backend/src/main/java/net/beetechgroup/beetask/frameworks/persistence/mapper/ProjectEntityMapper.java
index 8a1ab88..58336f4 100644
--- a/backend/src/main/java/net/beetechgroup/beetask/frameworks/persistence/mapper/ProjectEntityMapper.java
+++ b/backend/src/main/java/net/beetechgroup/beetask/frameworks/persistence/mapper/ProjectEntityMapper.java
@@ -6,6 +6,7 @@ import net.beetechgroup.beetask.frameworks.persistence.entities.ProjectEntity;
 public class ProjectEntityMapper {
 
     public static ProjectEntity toEntity(Project project) {
+        if (project == null) return null;
         ProjectEntity entity = new ProjectEntity();
         entity.setId(project.getId());
         entity.setName(project.getName());
diff --git a/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskMapper.java b/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskMapper.java
index 1e588fb..0101d25 100644
--- a/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskMapper.java
+++ b/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskMapper.java
@@ -10,7 +10,7 @@ public class CreateTaskMapper {
                 task.getTitle(),
                 task.getDescription(),
                 task.getStatus(),
-                task.getProject().getName(),
+                task.getProject() != null ? task.getProject().getName() : null,
                 task.getHistory().stream().map(CreateTaskMapper::toTaskHistoryItemOutput).toList());
     }
 
diff --git a/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskUseCase.java b/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskUseCase.java
index 638e9a8..e3023b1 100644
--- a/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskUseCase.java
+++ b/backend/src/main/java/net/beetechgroup/beetask/usecase/task/create/CreateTaskUseCase.java
@@ -16,8 +16,11 @@ public class CreateTaskUseCase {
         task.setTitle(input.title());
         task.setDescription(input.description());
         task.setStatus(input.status());
-        task.setProject(new Project());
-        task.getProject().setId(input.projectId());
+        if (input.projectId() != null) {
+            Project project = new Project();
+            project.setId(input.projectId());
+            task.setProject(project);
+        }
         return CreateTaskMapper.toCreateTaskOutput(taskRepository.saveTask(task));
     }
 }