diff --git a/main.py b/main.py
index 3a9d46d..b3d502a 100644
--- a/main.py
+++ b/main.py
@@ -103,12 +103,7 @@ def main():
         # A. Handle non-blocking MCP client connection updates
         mcp.update()
         
-        # B. Check if custom draw text override has expired
-        if mcp.override_active and time.ticks_diff(now, mcp.override_timeout) > 0:
-            print("MCP Screen override expired. Returning to status dashboard...")
-            mcp.override_active = False
-            force_dashboard_redraw = True
-            
+
         # C. Draw local dashboard (if not overridden by MCP draw text commands)
         if not mcp.override_active:
             if force_dashboard_redraw or time.ticks_diff(now, last_dashboard_update) >= dashboard_update_interval_ms:
diff --git a/mcp_server.py b/mcp_server.py
index 9322a1f..99f5626 100644
--- a/mcp_server.py
+++ b/mcp_server.py
@@ -16,7 +16,6 @@ class MCPServer:
         self.sock = None
         self.active_led_mode = "off" # static, breath, rainbow, off
         self.override_active = False
-        self.override_timeout = 0
 
     def start(self, port=80):
         """Starts the TCP server non-blockingly."""
@@ -276,7 +275,6 @@ class MCPServer:
         """Executes hardware actions depending on the called tool name."""
         if name == "clear_screen":
             self.override_active = True
-            self.override_timeout = time.ticks_ms() + 30000 # 30-sec override
             color = int(args.get("color", 0))
             self.display.clear(color)
             self.display.show()
@@ -284,7 +282,6 @@ class MCPServer:
             
         elif name == "draw_text":
             self.override_active = True
-            self.override_timeout = time.ticks_ms() + 30000 # 30-sec override
             text = str(args.get("text", ""))
             x = int(args.get("x", 10))
             y = int(args.get("y", 10))
@@ -343,7 +340,6 @@ class MCPServer:
                 
         elif name == "draw_image":
             self.override_active = True
-            self.override_timeout = time.ticks_ms() + 30000 # 30-sec override
             
             pbm_b64 = args.get("pbm_base64")
             x = int(args.get("x", 0))