diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index fa55ba8..a31bd0a 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -2058,6 +2058,14 @@ void Courtroom::handle_chatmessage_2()
   set_scene(m_chatmessage[DESK_MOD], m_chatmessage[SIDE]);
 
   int emote_mod = m_chatmessage[EMOTE_MOD].toInt();
+  // Deal with invalid emote modifiers
+  if (emote_mod != 0 && emote_mod != 1 && emote_mod != 2 \
+        && emote_mod != 5 && emote_mod != 6) {
+      if (emote_mod == 4)
+          emote_mod = 6; // Addresses issue with an old bug that sent the wrong emote modifier for zoompre
+      else
+          emote_mod = 0;
+  }
 
   if (ao_app->flipping_enabled && m_chatmessage[FLIP].toInt() == 1)
     ui_vp_player_char->set_flipped(true);