diff --git a/src/packets.cpp b/src/packets.cpp
index dceddf2..e11d3b3 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -502,6 +502,8 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
 
     // emote
     emote = incoming_args[3].toString();
+    if (first_person)
+        emote = "";
     args.append(emote);
 
     // message text
@@ -566,12 +568,9 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
     args.append(QString::number(emote_mod));
 
     // char id
-    if (incoming_args[8].toInt() != char_id && incoming_args[8].toInt() != -1)
+    if (incoming_args[8].toInt() != char_id)
         return invalid;
-    if (first_person)
-        args.append("-1"); // messages with a cid of -1 don't update the viewport
-    else
-        args.append(incoming_args[8].toString());
+    args.append(incoming_args[8].toString());
 
     // sfx delay
     args.append(incoming_args[9].toString());