diff --git a/twisted/plugins/frncrosslink.py b/twisted/plugins/frncrosslink.py
index 995f4b1..5a4126d 100755
--- a/twisted/plugins/frncrosslink.py
+++ b/twisted/plugins/frncrosslink.py
@@ -97,9 +97,14 @@ class FRNCrosslinkClient(FRNClient):
         global talking, lastMessages
         self.txReq = False
         self.txOk = False
-        if talking == self:
-            lastMessages.insert(0, self.user.ON)
-            lastMessages = lastMessages[:5]
+        if talking is not None: # FIXME: This is not the right place
+            l = talking.user.ON
+            if len(lastMessages) > 0:
+                if lastMessages[0] == l:
+                    l = None
+            if l is not None:
+                lastMessages.insert(0, l)
+                lastMessages = lastMessages[:5]
         talking = None
         self.stopTransmission()