diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index 5ef9a644a..9d9ed78ad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -205,6 +205,11 @@ class TaskFilterDialog(context: Context, private val repository: TagRepository,
     }
 
     private fun stopEditing() {
+        // Filter out tags with empty names
+        val tagsToRemove = createdTags.values.filter { it.name.isBlank() }
+        createdTags.values.removeAll(tagsToRemove.toSet())
+        tags.removeAll(tagsToRemove)
+
         isEditingTags = false
         binding.tagsList.removeAllViews()
         createTagViews()