diff --git a/src/session.py b/src/session.py
index 2726ddd04..97ef3d568 100644
--- a/src/session.py
+++ b/src/session.py
@@ -153,12 +153,13 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 				if msgtxt == '':
 					return
 			else:
-				self.append_otr_tag = False
-
-				# We're also here if we just don't support OTR.
-				# Thus, we should strip the tags from plaintext
-				# messages since they look ugly.
 				if msgtxt:
+					self.append_otr_tag = False
+
+					# We're also here if we just don't
+					# support OTR. Thus, we should strip
+					# the tags from plaintext messages
+					# since they look ugly.
 					msgtxt = msgtxt.replace('\x20\x09\x20' \
 						'\x20\x09\x09\x09\x09\x20\x09' \
 						'\x20\x09\x20\x09\x20\x20', '')