diff --git a/src/packet/packet_ms.cpp b/src/packet/packet_ms.cpp
index b663bf0..742a886 100644
--- a/src/packet/packet_ms.cpp
+++ b/src/packet/packet_ms.cpp
@@ -82,7 +82,8 @@ AOPacket *PacketMS::validateIcPacket(AOClient &client) const
                       << "3"
                       << "4"
                       << "5";
-    QString l_incoming_deskmod = client.hide_desk ? "0" : l_incoming_args[0].toString();
+    QString l_incoming_deskmod = l_incoming_args[0].toString();
+    client.hide_desk = l_incoming_deskmod == "0" || client.hide_desk;
     if (allowed_desk_mods.contains(l_incoming_deskmod)) {
         // **WARNING : THIS IS A HACK!**
         // A proper solution would be to deprecate chat as an argument on the clientside