diff --git a/src/org/kde/kdeconnect/Helpers/DeviceHelper.kt b/src/org/kde/kdeconnect/Helpers/DeviceHelper.kt
index 0ec72b57..a7a836a3 100644
--- a/src/org/kde/kdeconnect/Helpers/DeviceHelper.kt
+++ b/src/org/kde/kdeconnect/Helpers/DeviceHelper.kt
@@ -129,8 +129,8 @@ object DeviceHelper {
 
     fun initializeDeviceId(context: Context) {
         val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-        val preferenceKeys: Set<String> = preferences.all.keys
-        if (preferenceKeys.contains(KEY_DEVICE_ID_PREFERENCE)) {
+        val deviceId = preferences.getString(KEY_DEVICE_ID_PREFERENCE, "")!!
+        if (DeviceInfo.isValidDeviceId(deviceId)) {
             return // We already have an ID
         }
         @SuppressLint("HardwareIds")