diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
index 32f0e2f53..81387444b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
@@ -66,7 +66,7 @@ public class BluetoothCommunicationService extends Service {
                 GBDevice device = intent.getParcelableExtra("device");
                 if (mGBDevice.equals(device)) {
                     mGBDevice = device;
-                    GB.setReceiversEnableState(mGBDevice.isConnected(), context);
+                    GB.setReceiversEnableState(mDeviceSupport.useAutoConnect() || mGBDevice.isConnected(), context);
                 }
             }
         }