diff --git a/lib/serverlist.dart b/lib/serverlist.dart
index ece22e8..93440b2 100644
--- a/lib/serverlist.dart
+++ b/lib/serverlist.dart
@@ -105,9 +105,7 @@ class _ServerListState extends State<ServerList> {
                             uri.text.isNotEmpty) {
                           _formKey.currentState.save();
                           _addServer(
-                              serverName.text.isEmpty
-                                  ? uri.text
-                                  : serverName.text,
+                              serverName.text,
                               uri.text);
                         }
                       },
@@ -209,7 +207,7 @@ class _ServerListState extends State<ServerList> {
           child: Align(
             alignment: Alignment.centerLeft,
             child: Text(
-              servers[index].displayName,
+              servers[index].displayName.isEmpty?servers[index].uri:servers[index].displayName,
               style: TextStyle(fontSize: 24),
             ),
           ),