diff --git a/app/src/main/java/dev/bartuzen/qbitcontroller/ui/torrentlist/TorrentListScreen.kt b/app/src/main/java/dev/bartuzen/qbitcontroller/ui/torrentlist/TorrentListScreen.kt
index 602fc231..3a0c0a84 100644
--- a/app/src/main/java/dev/bartuzen/qbitcontroller/ui/torrentlist/TorrentListScreen.kt
+++ b/app/src/main/java/dev/bartuzen/qbitcontroller/ui/torrentlist/TorrentListScreen.kt
@@ -66,6 +66,7 @@ import androidx.compose.material.icons.automirrored.outlined.DriveFileMove
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Dns
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.Error
 import androidx.compose.material.icons.filled.FilterList
@@ -1154,17 +1155,24 @@ fun TorrentListScreen(
                 modifier = Modifier
                     .fillMaxSize()
                     .padding(innerPadding)
-                    .clickable {
-                        val intent = Intent(context, SettingsActivity::class.java).apply {
-                            putExtra(SettingsActivity.Extras.MOVE_TO_ADD_SERVER, true)
-                        }
-                        context.startActivity(intent)
-                    }
-                    .padding(32.dp),
+                    .imePadding(),
             ) {
-                Text(
-                    text = stringResource(R.string.main_no_servers),
-                    textAlign = TextAlign.Center,
+                EmptyListMessage(
+                    icon = Icons.Filled.Dns,
+                    title = stringResource(R.string.torrent_list_no_server_title),
+                    description = stringResource(R.string.torrent_list_no_server_description),
+                    actionButton = {
+                        Button(
+                            onClick = {
+                                val intent = Intent(context, SettingsActivity::class.java).apply {
+                                    putExtra(SettingsActivity.Extras.MOVE_TO_ADD_SERVER, true)
+                                }
+                                context.startActivity(intent)
+                            },
+                        ) {
+                            Text(text = stringResource(R.string.torrent_list_no_server_add))
+                        }
+                    },
                     modifier = Modifier.align(Alignment.Center),
                 )
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8a604f1..b15e0f82 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,9 +64,10 @@
 
     <string name="main_action_settings">Settings</string>
     <string name="main_action_about">About</string>
-    <string name="main_no_servers">No servers have been found. Click here to add one.</string>
-    <string name="main_add_server">Add Server</string>
 
+    <string name="torrent_list_no_server_title">No Servers Available</string>
+    <string name="torrent_list_no_server_description">You haven\'t added any servers yet. Add one to get started.</string>
+    <string name="torrent_list_no_server_add">Add Server</string>
     <string name="torrent_list_empty_title">No Torrents Found</string>
     <string name="torrent_list_empty_description">You don\'t have any torrents. Add one to get started.</string>
     <string name="torrent_list_empty_rss">Add via RSS</string>