diff --git a/components/tesla_ble_vehicle/tesla_ble_vehicle.cpp b/components/tesla_ble_vehicle/tesla_ble_vehicle.cpp
index 86f8089..614a512 100644
--- a/components/tesla_ble_vehicle/tesla_ble_vehicle.cpp
+++ b/components/tesla_ble_vehicle/tesla_ble_vehicle.cpp
@@ -772,11 +772,14 @@ namespace esphome
                     break;
                   }
                 }
-                ESP_LOGE(TAG, "[%s] Received CarServer ERROR message, retrying command..",
-                         current_command.execute_name.c_str());
-                if (current_command.state == BLECommandState::WAITING_FOR_RESPONSE)
+                else
                 {
-                  current_command.state = BLECommandState::READY;
+                  ESP_LOGE(TAG, "[%s] Received CarServer ERROR message, retrying command..",
+                           current_command.execute_name.c_str());
+                  if (current_command.state == BLECommandState::WAITING_FOR_RESPONSE)
+                  {
+                    current_command.state = BLECommandState::READY;
+                  }
                 }
                 break;
               }