diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
index 22997a42..55d5bee0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/database/DBHelper.java
@@ -384,7 +384,9 @@ public class DBHelper {
         } else {
             ensureDeviceUpToDate(device, gbDevice, session);
         }
-        ensureDeviceAttributes(device, gbDevice, session);
+        if (gbDevice.isInitialized()) {
+            ensureDeviceAttributes(device, gbDevice, session);
+        }
 
         return device;
     }