diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/discovery/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/discovery/DiscoveryActivity.java
index 6ed80aee0..8083df426 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/discovery/DiscoveryActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/discovery/DiscoveryActivity.java
@@ -294,8 +294,20 @@ public class DiscoveryActivity extends Activity implements AdapterView.OnItemCli
         }
 
         DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(deviceCandidate);
-        Intent intent = new Intent(this, coordinator.getPairingActivity());
-        intent.putExtra(DeviceCoordinator.EXTRA_DEVICE_MAC_ADDRESS, deviceCandidate.getMacAddress());
-        startActivity(intent);
+        Class<? extends Activity> pairingActivity = coordinator.getPairingActivity();
+        if (pairingActivity != null) {
+            Intent intent = new Intent(this, pairingActivity);
+            intent.putExtra(DeviceCoordinator.EXTRA_DEVICE_MAC_ADDRESS, deviceCandidate.getMacAddress());
+            startActivity(intent);
+        }
+        else {
+            try {
+                BluetoothDevice btDevice = adapter.getRemoteDevice(deviceCandidate.getMacAddress());
+                btDevice.createBond();
+                finish();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleCoordinator.java
index 53476b8bf..03e5fe431 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleCoordinator.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleCoordinator.java
@@ -2,7 +2,6 @@ package nodomain.freeyourgadget.gadgetbridge.pebble;
 
 import android.app.Activity;
 
-import nodomain.freeyourgadget.gadgetbridge.ControlCenter;
 import nodomain.freeyourgadget.gadgetbridge.DeviceCoordinator;
 import nodomain.freeyourgadget.gadgetbridge.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.GBDevice;
@@ -26,6 +25,6 @@ public class PebbleCoordinator implements DeviceCoordinator {
 
     @Override
     public Class<? extends Activity> getPairingActivity() {
-        return ControlCenter.class;
+        return null;
     }
 }