diff --git a/include/aoclient.h b/include/aoclient.h
index effbfcf..214189c 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -123,6 +123,13 @@ class AOClient : public QObject {
      */
     QString current_char;
 
+    /**
+     * @brief The internal name of the character the client is iniswapped to.
+     *
+     * @note This will be the same as current_char if the client is not iniswapped.
+     */
+    QString current_iniswap;
+
     /**
      * @brief If true, the client is a logged-in moderator.
      */
diff --git a/src/packets.cpp b/src/packets.cpp
index 99649d6..1bd3f0d 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -404,6 +404,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
         }
         qDebug() << "INI swap detected from " << getIpid();
     }
+    current_iniswap = incoming_args[2].toString();
     args.append(incoming_args[2].toString());
 
     // emote
@@ -516,7 +517,7 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
                     && other_charid != char_id
                     && client->char_id == pairing_with
                     && client->pos == pos) {
-                other_name = server->characters.at(other_charid);
+                other_name = client->current_iniswap;
                 other_emote = client->emote;
                 other_offset = client->offset;
                 other_flip = client->flipping;