diff --git a/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt b/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt
index 0756fdb5..cda4452d 100644
--- a/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt
+++ b/android/app/src/main/java/com/audiobookshelf/app/device/DeviceManager.kt
@@ -87,8 +87,7 @@ object DeviceManager {
    * @return The ServerConnectionConfig instance or null if not found.
    */
   fun getServerConnectionConfig(id: String?): ServerConnectionConfig? {
-    if (id == null) return null
-    return deviceData.serverConnectionConfigs.find { it.id == id }
+    return id?.let { deviceData.serverConnectionConfigs.find { it.id == id } }
   }
 
   /**