diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
index 58f1ad894..5fdb1ce6f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/AutoStartReceiver.java
@@ -32,7 +32,13 @@ public class AutoStartReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         if (GBApplication.getGBPrefs().getAutoStart() && Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
             Log.i(TAG, "Boot completed, starting Gadgetbridge");
-            GBApplication.deviceService().start();
+            if (GBApplication.getPrefs().getBoolean("general_autoconnectonbluetooth", false)) {
+                Log.i(TAG, "Autoconnect is enabled, attempting to connect");
+                GBApplication.deviceService().connect();
+            } else {
+                GBApplication.deviceService().start();
+            }
+
             PeriodicExporter.enablePeriodicExport(context);
         }
     }