diff --git a/app/Http/Controllers/RoomControlController.php b/app/Http/Controllers/RoomControlController.php
index 11c2d14..f322f14 100644
--- a/app/Http/Controllers/RoomControlController.php
+++ b/app/Http/Controllers/RoomControlController.php
@@ -261,6 +261,10 @@ class RoomControlController extends Controller
         if (empty($room->internal_ip) || empty($room->port)) {
             return ApiResponse::error('房間未設定 IP 或 Port');
         }
+        $room->status=$validated['command'];
+        $room->started_at=$validated['started_at'];
+        $room->ended_at=$validated['ended_at'];
+        $room->save();
 
         $suffix = substr($room->name, -3) ?: $room->name;
         $signal = match ($validated['command']) {
@@ -282,15 +286,9 @@ class RoomControlController extends Controller
                 'ip'      => $room->internal_ip,
                 'port'    => $room->port,
             ]);
-            $validated['command']="error";
-            $validated['started_at']=null;
-            $validated['ended_at']=null;
         }
 
-        $room->status=$validated['command'];
-        $room->started_at=$validated['started_at'];
-        $room->ended_at=$validated['ended_at'];
-        $room->save();
+        
         $response = (new MachineStatusForwarder(
             $branch->external_ip, 
             "/api/room/receiveSwitch",