diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index d6e14760f..fe646aecd 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -334,7 +334,7 @@ class TaskEditViewModel @ViewModelInject constructor(
             it.modificationDate = currentTimeMillis()
         }
 
-        if (originalTags?.toHashSet() != selectedTags?.toHashSet()) {
+        if ((isNew && selectedTags?.isNotEmpty() == true) || originalTags?.toHashSet() != selectedTags?.toHashSet()) {
             tagDao.applyTags(it, tagDataDao, selectedTags!!)
             it.modificationDate = currentTimeMillis()
         }