diff --git a/lobby.cpp b/lobby.cpp
index 2ba7973..d38baa7 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -162,6 +162,8 @@ void Lobby::on_about_clicked()
 
 void Lobby::list_servers()
 {
+  ui_server_list->clear();
+
   for (server_type i_server : ao_app->server_list)
   {
     ui_server_list->addItem(i_server.name);
diff --git a/packet_distribution.cpp b/packet_distribution.cpp
index 334ac4a..bd713bb 100644
--- a/packet_distribution.cpp
+++ b/packet_distribution.cpp
@@ -13,6 +13,8 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
 
   if (header == "ALL")
   {
+    server_list.clear();
+
     for (QString i_string : p_packet->get_contents())
     {
       server_type f_server;
@@ -21,7 +23,7 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
       if (sub_contents.size() < 4)
       {
         qDebug() << "W: malformed packet!";
-        return;
+        continue;
       }
 
       f_server.name = sub_contents.at(0);