diff --git a/build.gradle b/build.gradle
index 8f41cadf..1ccac5fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps
-    implementation 'com.jaredrummler:android-device-names:2.1.1' //To get a human-friendly device name
+    implementation 'com.jaredrummler:android-device-names:1.1.9' //To get a human-friendly device name
 
     implementation 'org.apache.sshd:sshd-core:0.14.0'
     implementation 'org.apache.mina:mina-core:2.0.19' //For some reason, makes sshd-core:0.14.0 work without NIO, which isn't available until Android 8 (api 26)
diff --git a/src/org/kde/kdeconnect/Helpers/DeviceHelper.java b/src/org/kde/kdeconnect/Helpers/DeviceHelper.java
index f8d826d6..12c50531 100644
--- a/src/org/kde/kdeconnect/Helpers/DeviceHelper.java
+++ b/src/org/kde/kdeconnect/Helpers/DeviceHelper.java
@@ -53,6 +53,7 @@ public class DeviceHelper {
         // Could use preferences.contains but would need to check for empty String anyway.
         String deviceName = preferences.getString(KEY_DEVICE_NAME_PREFERENCE, "");
         if (deviceName.isEmpty()) {
+            //DeviceName.init(context); // Needed in DeviceName 2.x +
             if (!fetchingName) {
                 fetchingName = true;
                 DeviceHelper.backgroundFetchDeviceName(context); //Starts a background thread that will eventually update the shared pref