diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 42b1932d4..9ed27fea4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -512,7 +512,11 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 if(targetedDevice != null){
                     targetedDevices.add(targetedDevice);
                 }else{
-                    targetedDevices.addAll(Arrays.asList(getGBDevices()));
+                    for(GBDevice device : getGBDevices()){
+                        if(isDeviceInitialized(device)){
+                            targetedDevices.add(device);
+                        }
+                    }
                 }
                 for (GBDevice device1 : targetedDevices) {
                     try {