diff --git a/common/src/main/java/io/homeassistant/companion/android/database/server/ServerConnectionInfo.kt b/common/src/main/java/io/homeassistant/companion/android/database/server/ServerConnectionInfo.kt
index 7ef8183a2..f00526493 100644
--- a/common/src/main/java/io/homeassistant/companion/android/database/server/ServerConnectionInfo.kt
+++ b/common/src/main/java/io/homeassistant/companion/android/database/server/ServerConnectionInfo.kt
@@ -106,19 +106,27 @@ data class ServerConnectionInfo(
 class InternalSsidTypeConverter {
     @TypeConverter
     fun fromStringToList(value: String): List<String> {
-        return try {
-            jacksonObjectMapper().readValue(value)
-        } catch (e: JsonProcessingException) {
+        return if (value == "[]" || value.isBlank()) {
             emptyList()
+        } else {
+            try {
+                jacksonObjectMapper().readValue(value)
+            } catch (e: JsonProcessingException) {
+                emptyList()
+            }
         }
     }
 
     @TypeConverter
     fun fromListToString(value: List<String>): String {
-        return try {
-            jacksonObjectMapper().writeValueAsString(value)
-        } catch (e: JsonProcessingException) {
-            ""
+        return if (value.isEmpty()) {
+            "[]"
+        } else {
+            try {
+                jacksonObjectMapper().writeValueAsString(value)
+            } catch (e: JsonProcessingException) {
+                ""
+            }
         }
     }
 }