diff --git a/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java b/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
index b9e327f65..fd673f698 100644
--- a/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
+++ b/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
@@ -459,7 +459,7 @@ protected Model getModel() {
 
     private void connectWebController() {
         phoneController.connectWebServer();
-        Enums.DriveMode oldDriveMode = currentDriveMode;
+        Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
         // Currently only dual drive mode supported
         setDriveMode(Enums.DriveMode.GAME);
         binding.controllerContainer.driveMode.setAlpha(0.5f);
@@ -575,7 +575,7 @@ protected void setDriveMode(Enums.DriveMode driveMode) {
 
     private void connectPhoneController() {
         phoneController.connect(requireContext());
-        Enums.DriveMode oldDriveMode = currentDriveMode;
+        Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
         // Currently only dual drive mode supported
         setDriveMode(Enums.DriveMode.DUAL);
         binding.controllerContainer.driveMode.setAlpha(0.5f);
diff --git a/android/robot/src/main/java/org/openbot/common/ControlsFragment.java b/android/robot/src/main/java/org/openbot/common/ControlsFragment.java
index 5d2c5fe47..d771ea79e 100644
--- a/android/robot/src/main/java/org/openbot/common/ControlsFragment.java
+++ b/android/robot/src/main/java/org/openbot/common/ControlsFragment.java
@@ -52,8 +52,6 @@ public abstract class ControlsFragment extends Fragment implements ServerListene
   protected Animation startAnimation;
   protected SharedPreferencesManager preferencesManager;
   protected PhoneController phoneController;
-  protected Enums.DriveMode currentDriveMode = Enums.DriveMode.GAME;
-
   protected AudioPlayer audioPlayer;
 
   protected final String voice = "matthew";
@@ -282,7 +280,7 @@ private void handlePhoneControllerEvents() {
               // That is why we are not calling phoneController.send() here directly.
               BotToControllerEventBus.emitEvent(
                   ConnectionUtils.getStatus(
-                      false, false, false, currentDriveMode.toString(), vehicle.getIndicator()));
+                      false, false, false, vehicle.getDriveMode().toString(), vehicle.getIndicator()));
               break;
 
             case Constants.CMD_DISCONNECTED:
diff --git a/android/robot/src/main/java/org/openbot/logging/LoggerFragment.java b/android/robot/src/main/java/org/openbot/logging/LoggerFragment.java
index 1a6741c93..c122a5385 100644
--- a/android/robot/src/main/java/org/openbot/logging/LoggerFragment.java
+++ b/android/robot/src/main/java/org/openbot/logging/LoggerFragment.java
@@ -585,7 +585,7 @@ protected void setDriveMode(Enums.DriveMode driveMode) {
 
   private void connectPhoneController() {
     phoneController.connect(requireContext());
-    Enums.DriveMode oldDriveMode = currentDriveMode;
+    Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
     // Currently only dual drive mode supported
     setDriveMode(Enums.DriveMode.DUAL);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
@@ -595,7 +595,7 @@ private void connectPhoneController() {
 
   private void connectWebController() {
     phoneController.connectWebServer();
-    Enums.DriveMode oldDriveMode = currentDriveMode;
+    Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
     // Currently only dual drive mode supported
     setDriveMode(Enums.DriveMode.GAME);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
diff --git a/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java b/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
index ee65e123c..18a8efdfa 100644
--- a/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
+++ b/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
@@ -654,7 +654,7 @@ protected void setDriveMode(Enums.DriveMode driveMode) {
 
   private void connectPhoneController() {
     phoneController.connect(requireContext());
-    Enums.DriveMode oldDriveMode = currentDriveMode;
+    Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
     // Currently only dual drive mode supported
     setDriveMode(Enums.DriveMode.DUAL);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
@@ -664,7 +664,7 @@ private void connectPhoneController() {
 
   private void connectWebController() {
     phoneController.connectWebServer();
-    Enums.DriveMode oldDriveMode = currentDriveMode;
+    Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
     // Currently only dual drive mode supported
     setDriveMode(Enums.DriveMode.GAME);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
diff --git a/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java b/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
index b41667d26..ef01e6bc9 100644
--- a/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
+++ b/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
@@ -262,7 +262,7 @@ protected void setDriveMode(DriveMode driveMode) {
 
   private void connectPhoneController() {
     phoneController.connect(requireContext());
-    DriveMode oldDriveMode = currentDriveMode;
+    DriveMode oldDriveMode = vehicle.getDriveMode();
     // Currently only dual drive mode supported
     setDriveMode(DriveMode.DUAL);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
@@ -272,7 +272,7 @@ private void connectPhoneController() {
 
   private void connectWebController() {
     phoneController.connectWebServer();
-    Enums.DriveMode oldDriveMode = currentDriveMode;
+    Enums.DriveMode oldDriveMode = vehicle.getDriveMode();
     // Currently only dual drive mode supported
     setDriveMode(Enums.DriveMode.GAME);
     binding.controllerContainer.driveMode.setAlpha(0.5f);