diff --git a/vrobbler/apps/profiles/models.py b/vrobbler/apps/profiles/models.py
index bfd2775..1337712 100644
--- a/vrobbler/apps/profiles/models.py
+++ b/vrobbler/apps/profiles/models.py
@@ -141,12 +141,10 @@ class UserProfile(TimeStampedModel):
 
     @cached_property
     def task_context_tags(self) -> list[str]:
-        tag_list = [
-            t.strip().capitalize()
-            for t in self.task_context_tags_str.split(",")
-        ]
-
-        if not tag_list:
-            tag_list = settings.DEFAULT_TASK_CONTEXT_TAG_LIST
+        tag_list = settings.DEFAULT_TASK_CONTEXT_TAGS
+        tags = ""
+        if self.task_context_tags_str:
+            tags = self.task_context_tags_str
+            tag_list = [t.strip().capitalize() for t in tags.split(",")]
 
         return tag_list