diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
index 04179458..26118112 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/AbstractBTLEDeviceSupport.java
@@ -147,7 +147,6 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
     }
 
     private void gattServicesDiscovered(List<BluetoothGattService> discoveredGattServices) {
-
         if (discoveredGattServices == null) {
             return;
         }
@@ -180,7 +179,7 @@ public abstract class AbstractBTLEDeviceSupport extends AbstractDeviceSupport im
 
     @Override
     public void onServicesDiscovered(BluetoothGatt gatt) {
-        gattServicesDiscovered(getQueue().getSupportedGattServices());
+        gattServicesDiscovered(gatt.getServices());
         initializeDevice(createTransactionBuilder("Initializing device")).queue(getQueue());
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
index f6009435..4a432d0b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
@@ -308,6 +308,12 @@ public final class BtLEQueue {
         public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
             LOG.debug("connection state change, newState: " + newState + getStatusString(status));
 
+            synchronized (mGattMonitor) {
+                if (mBluetoothGatt == null) {
+                    mBluetoothGatt = gatt;
+                }
+            }
+
             if (!checkCorrectGattInstance(gatt, "connection state event")) {
                 return;
             }