diff --git a/ev3sim/updates.py b/ev3sim/updates.py
index ca797475..bd7b299b 100644
--- a/ev3sim/updates.py
+++ b/ev3sim/updates.py
@@ -120,7 +120,10 @@ def action(result):
 
 def fill_workspace():
     """Always ensure workspace has the necessary folders."""
-    ensure_workspace_filled(find_abs_directory("workspace"))
+    from ev3sim.simulation.loader import StateHandler
+
+    if StateHandler.WORKSPACE_FOLDER:
+        ensure_workspace_filled(find_abs_directory("workspace"))
     return None