diff --git a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
index 1dca1c5d..15bbd7f4 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/bluetooth/BluetoothCommunication.java
@@ -332,6 +332,9 @@ public abstract class BluetoothCommunication {
     public void connect(String hwAddress) {
         btAdapter.cancelDiscovery();
 
+        // Don't do any cleanup if disconnected before fully connected
+        btMachineState = BT_MACHINE_STATE.BT_CLEANUP_STATE;
+
         BluetoothDevice device = btAdapter.getRemoteDevice(hwAddress);
         bluetoothGatt = device.connectGatt(context, false, gattCallback);
     }