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 1189f1b59..66865a5d8 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -149,7 +149,7 @@ public class DeviceCommunicationService extends Service {
                     sharedPrefs.edit().putString("last_device_address", btDeviceAddress).apply();
                 }
 
-                if (btDeviceAddress != null && !isConnected() && !isConnecting()) {
+                if (btDeviceAddress != null && !isConnecting() && !isConnected()) {
                     if (mDeviceSupport != null) {
                         mDeviceSupport.dispose();
                         mDeviceSupport = null;
@@ -173,10 +173,9 @@ public class DeviceCommunicationService extends Service {
                 }
                 break;
             case ACTION_REQUEST_VERSIONINFO:
+                mGBDevice.sendDeviceUpdateIntent(this);
                 if (mGBDevice.getFirmwareVersion() == null) {
                     mDeviceSupport.onFirmwareVersionReq();
-                } else {
-                    mGBDevice.sendDeviceUpdateIntent(this);
                 }
                 break;
             case ACTION_NOTIFICATION_GENERIC: {