diff --git a/src/session.py b/src/session.py
index 917cd2c624e39d470bcb20ac9cfdcbd9bf092bcc..1df578c741b1531bb1f52ab55147f30135dca0c7 100644
--- a/src/session.py
+++ b/src/session.py
@@ -65,7 +65,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
 		msg_type = msg.getType()
 		subject = msg.getSubject()
 
-		if not msg_type:
+		if not msg_type or msg_type not in ('chat', 'groupchat', 'error'):
 			msg_type = 'normal'
 
 		msg_id = None