diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerAddressAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerAddressAdapter.kt
index dc78ef39..e4e93884 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerAddressAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/ServerAddressAdapter.kt
@@ -15,8 +15,7 @@ class ServerAddressAdapter(
     class ServerAddressViewHolder(private var binding: ServerAddressListItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(address: ServerAddress) {
-            binding.address = address
-            binding.executePendingBindings()
+            binding.serverAddress.text = address.address
         }
     }
 
diff --git a/app/phone/src/main/res/layout/discovered_server_item.xml b/app/phone/src/main/res/layout/discovered_server_item.xml
index 2c4af382..1afd77aa 100644
--- a/app/phone/src/main/res/layout/discovered_server_item.xml
+++ b/app/phone/src/main/res/layout/discovered_server_item.xml
@@ -37,7 +37,6 @@
         android:layout_marginTop="8dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:text="@{server.name}"
         android:textAlignment="center"
         android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/phone/src/main/res/layout/server_address_list_item.xml b/app/phone/src/main/res/layout/server_address_list_item.xml
index 0a2fe4a3..c96faacd 100644
--- a/app/phone/src/main/res/layout/server_address_list_item.xml
+++ b/app/phone/src/main/res/layout/server_address_list_item.xml
@@ -1,34 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="24dp"
+    android:layout_marginTop="12dp"
+    android:layout_marginBottom="12dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background">
 
-    <data>
-
-        <variable
-            name="address"
-            type="dev.jdtech.jellyfin.models.ServerAddress" />
-    </data>
-
-    <LinearLayout
+    <TextView
+        android:id="@+id/server_address"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background">
-
-        <TextView
-            android:id="@+id/user_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{address.address}"
-            android:layout_margin="12dp"
-            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-            tools:text="https://..." />
-    </LinearLayout>
-
-</layout>
\ No newline at end of file
+        android:layout_margin="12dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        tools:text="https://..." />
+</LinearLayout>
\ No newline at end of file