diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp
index 74c32b959..966f25b8b 100644
--- a/src/core/analog_controller.cpp
+++ b/src/core/analog_controller.cpp
@@ -422,13 +422,11 @@ bool AnalogController::Transfer(const u8 data_in, u8* data_out)
         m_rumble_config_large_motor_index = -1;
         m_rumble_config_small_motor_index = -1;
       }
-      else if (m_configuration_mode)
-      {
-        Log_ErrorPrintf("Unimplemented config mode command 0x%02X", data_in);
-        Panic("Unimplemented config mode command");
-      }
       else
       {
+        if (m_configuration_mode)
+          Log_ErrorPrintf("Unimplemented config mode command 0x%02X", data_in);
+
         *data_out = 0xFF;
         return false;
       }