diff --git a/omemo/omemo/state.py b/omemo/omemo/state.py
index a7e96f2ec65f91420dedd8da402cd9cecee39ba8..91cd3196fc105b683740a5e5d08d87d7d76ee382 100644
--- a/omemo/omemo/state.py
+++ b/omemo/omemo/state.py
@@ -228,9 +228,7 @@ class OmemoState:
 
         payload, tag = encrypt(key, iv, plaintext)
 
-        # for XEP-384 Compliance uncomment
-        # key += tag
-        payload += tag
+        key += tag
 
         # Encrypt the message key with for each of receivers devices
         for device in devices_list:
@@ -289,9 +287,7 @@ class OmemoState:
 
         payload, tag = encrypt(key, iv, plaintext)
 
-        # for XEP-384 Compliance uncomment
-        # key += tag
-        payload += tag
+        key += tag
 
         for tup in devices_list:
             self.get_session_cipher(tup[0], tup[1])