diff --git a/dmapp/dmcore/main.py b/dmapp/dmcore/main.py
index 572d4e3..3cc3de7 100644
--- a/dmapp/dmcore/main.py
+++ b/dmapp/dmcore/main.py
@@ -92,9 +92,13 @@ while True:
 
         # if current_task in work_task_ids and current_task != current_work_task:
         if current_task not in work_task_ids:
-            current_task = current_work_task
-            state.save("current", task=current_task)
-            task.db_to_file_as_is(None)
+            # Enforce work task if current task is not in workspace
+            if current_task != current_work_task:
+                current_task = current_work_task
+                state.save("current", task=current_task)
+                task.db_to_file_as_is(None)
+        elif current_task != current_work_task:
+            # Update work state when switching to a different valid task
             state.update_work_state(work_desktops[current_workspace], current_task)
 
     # regular flow
diff --git a/dmapp/dmcore/sample_task_file b/dmapp/dmcore/sample_task_file
index 9eb1b6a..26aa650 100644
--- a/dmapp/dmcore/sample_task_file
+++ b/dmapp/dmcore/sample_task_file
@@ -1,37 +1,14 @@
 work
-    default                                                     |ffbe198e
-        dm                                                      |77532dd4 *
+    default                                                     |ffbe198e *
+        dm                                                      |77532dd4
     vhs                                                         |c851ce32
+        main algorithm                                          |f5dc761b
     dlt                                                         |b4378ac5
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 think
     lectura
         guitarra
@@ -47,7 +24,7 @@ think
             memoria                                             |1dc8a7c2
 
         video
-            blender
+            blender                                             |45d30f09
             motion graphics
             unreal
             houdini