diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
index baff788d67..d9e42fc1d1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java
@@ -70,7 +70,7 @@ public class ExternalPebbleJSActivity extends AbstractGBActivity {
         UUID currentUUID = null;
         GBDevice currentDevice = null;
 
-        if (extras == null) {
+        if (extras == null || (extras.getParcelable(GBDevice.EXTRA_DEVICE) == null)) {
             confUri = getIntent().getData();
             if(confUri.getScheme().equals("gadgetbridge")) {
                 try {