diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
index 5f102119..2d5a6164 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
@@ -110,7 +110,13 @@ public class ControlCenter extends Activity {
         startIntent.setAction(BluetoothCommunicationService.ACTION_START);
         startService(startIntent);
 
-        requestDeviceInfo();
+
+        if (deviceList.isEmpty()) {
+            // start discovery when no devices are present
+            startActivity(new Intent(this, DiscoveryActivity.class));
+        } else {
+            requestDeviceInfo();
+        }
     }
 
     /**