diff --git a/source/main/gui/panels/GUI_MultiplayerClientList.cpp b/source/main/gui/panels/GUI_MultiplayerClientList.cpp
index b8822f0596..366fafc4d4 100644
--- a/source/main/gui/panels/GUI_MultiplayerClientList.cpp
+++ b/source/main/gui/panels/GUI_MultiplayerClientList.cpp
@@ -65,6 +65,11 @@ void MpClientList::Draw()
 
     int y = 20 + (ImGui::GetTextLineHeightWithSpacing() * m_users.size());
 
+    if (App::GetNetwork()->GetNetQuality() != 0)
+    {
+        y += 20;
+    }
+
     ImGui::SetNextWindowSize(ImVec2((content_width + (2*ImGui::GetStyle().WindowPadding.x)), y));
     ImGui::PushStyleColor(ImGuiCol_WindowBg, theme.semitransparent_window_bg);
     ImGui::Begin("Peers", nullptr, flags);
diff --git a/source/main/network/Network.cpp b/source/main/network/Network.cpp
index c98cd44fa7..25d603bfa8 100644
--- a/source/main/network/Network.cpp
+++ b/source/main/network/Network.cpp
@@ -590,6 +590,7 @@ void Network::Disconnect()
         m_socket.close_fd();
     }
 
+    SetNetQuality(0);
     m_users.clear();
     m_disconnected_users.clear();
     m_recv_packet_buffer.clear();