diff --git a/src/demoserver.cpp b/src/demoserver.cpp
index 93eaad567..a61c57c49 100644
--- a/src/demoserver.cpp
+++ b/src/demoserver.cpp
@@ -147,9 +147,7 @@ void DemoServer::handle_packet(AOPacket p_packet)
   }
   else if (header == "ID")
   {
-    QStringList feature_list = {"noencryption", "yellowtext", "prezoom", "flipping", "customobjections", "fastloading", "deskmod", "evidence", "cccc_ic_support", "arup", "casing_alerts", "modcall_reason", "looping_sfx", "additive", "effects", "y_offset", "expanded_desk_mods"};
     client_sock->sendTextMessage("PN#0#1#%");
-    client_sock->sendTextMessage("FL#" + feature_list.join('#') + "#%");
   }
   else if (header == "askchaa")
   {
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index f82c3aca1..94fddca53 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -59,12 +59,15 @@ void AOApplication::server_packet_received(AOPacket packet)
     {
       return;
     }
+    log_to_demo = false;
 
     client_id = content.at(0).toInt();
     m_serverdata.set_server_software(content.at(1));
 
     net_manager->server_connected(true);
 
+    w_courtroom->set_widgets();
+
     QStringList f_contents = {"AO2", get_version_string()};
     send_server_packet(AOPacket("ID", f_contents));
   }
@@ -84,11 +87,6 @@ void AOApplication::server_packet_received(AOPacket packet)
       w_courtroom->append_server_chatmessage(content.at(0), content.at(1), "0");
     }
   }
-  else if (header == "FL")
-  {
-    w_courtroom->set_widgets();
-    log_to_demo = false;
-  }
   else if (header == "PN")
   {
     if (!is_lobby_constructed() || content.size() < 2)