diff --git a/operators/tracker.py b/operators/tracker.py
index 0865837..638e977 100644
--- a/operators/tracker.py
+++ b/operators/tracker.py
@@ -499,13 +499,18 @@ class VSETB_OT_upload_to_tracker(Operator):
             if upload_to_tracker.tasks_comment:
                 for task_type in self.project.task_types:
 
-                    task = getattr(strip_settings.tasks, norm_name(task_type.name))
+                    task_settings = getattr(strip_settings.tasks, norm_name(task_type.name))
+                    if not task_settings.comment:
+                        continue
+
                     tracker_task = tracker.get_task(task_type.name, entity=shot)
+                    if not tracker_task:
+                        tracker_task = tracker.new_task(shot, task_type=task_type.name)
 
                     last_comment = tracker_task.get('last_comment')
                     last_comment_text = last_comment.get('text', '') if isinstance(last_comment, dict) else str(last_comment or '')
-                    if task.comment and last_comment_text != task.comment:
-                        tracker.new_comment(tracker_task, comment=task.comment)
+                    if last_comment_text != task_settings.comment:
+                        tracker.new_comment(tracker_task, comment=task_settings.comment)
 
         context.window_manager.progress_end()