diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 9ccc92b1..93f02309 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -80,9 +80,9 @@ function xmpp_update_e2e_policy {
         sed -i 's|e2e_policy_chat.*|e2e_policy_chat = "required"|g' "$filename"
     fi
     if ! grep -q "e2e_policy_message_required_chat" "$filename"; then
-        echo "e2e_policy_message_required_chat = \"\"" >> "$filename"
+        echo "e2e_policy_message_required_chat = \"$xmpp_encryption_warning\"" >> "$filename"
     else
-        sed -i "s|e2e_policy_message_required_chat.*|e2e_policy_message_required_chat = \"\"|g" "$filename"
+        sed -i "s|e2e_policy_message_required_chat.*|e2e_policy_message_required_chat = \"$xmpp_encryption_warning\"|g" "$filename"
     fi
 
     if [[ "$ONION_ONLY" != 'no' ]]; then