diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart
index a4e6bbf54..f9ab43eda 100644
--- a/lib/data/repositories/task_repository.dart
+++ b/lib/data/repositories/task_repository.dart
@@ -52,11 +52,6 @@ class TaskRepository {
   }
 
   Future<TaskEntity> saveData(Credentials credentials, TaskEntity task) async {
-    // Workaround for API issue
-    if (task.isNew) {
-      task = task.rebuild((b) => b..id = null);
-    }
-
     final data = serializers.serializeWith(TaskEntity.serializer, task);
 
     dynamic response;
@@ -88,7 +83,7 @@ class TaskRepository {
         data: fields, filePath: filePath, fileIndex: 'documents[]');
 
     final TaskItemResponse taskResponse =
-    serializers.deserializeWith(TaskItemResponse.serializer, response);
+        serializers.deserializeWith(TaskItemResponse.serializer, response);
 
     return taskResponse.data;
   }
diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart
index 03bf2f5bb..94502cdd1 100644
--- a/lib/redux/task/task_selectors.dart
+++ b/lib/redux/task/task_selectors.dart
@@ -184,9 +184,9 @@ double taskRateSelector(
     {CompanyEntity company, ProjectEntity project, ClientEntity client}) {
   if (project != null && project.taskRate > 0) {
     return project.taskRate;
-  } else if (client != null && client.settings.defaultTaskRate > 0) {
+  } else if (client != null && (client.settings.defaultTaskRate ?? 0) > 0) {
     return client.settings.defaultTaskRate;
-  } else if (company != null && company.settings.defaultTaskRate > 0) {
+  } else if (company != null && (company.settings.defaultTaskRate ?? 0) > 0) {
     return company.settings.defaultTaskRate;
   }
 
diff --git a/lib/ui/task/view/task_view.dart b/lib/ui/task/view/task_view.dart
index 0393a9429..27e59750f 100644
--- a/lib/ui/task/view/task_view.dart
+++ b/lib/ui/task/view/task_view.dart
@@ -89,7 +89,7 @@ class _TaskViewState extends State<TaskView> {
           List<Widget> _buildView() {
             final widgets = <Widget>[
               EntityHeader(
-                entity: project,
+                entity: task,
                 statusColor: task.isInvoiced
                     ? Colors.green
                     : task.isRunning
diff --git a/lib/ui/task/view/task_view_vm.dart b/lib/ui/task/view/task_view_vm.dart
index 20507961e..0f6d152d8 100644
--- a/lib/ui/task/view/task_view_vm.dart
+++ b/lib/ui/task/view/task_view_vm.dart
@@ -60,8 +60,7 @@ class TaskViewVM {
 
   factory TaskViewVM.fromStore(Store<AppState> store) {
     final state = store.state;
-    final task = state.taskState.map[state.taskUIState.selectedId] ??
-        TaskEntity(id: state.taskUIState.selectedId);
+    final task = state.taskState.get(state.taskUIState.selectedId);
     final client = state.clientState.map[task.clientId];
     final project = state.projectState.map[task.projectId];