diff --git a/native/profile/tunnelbroker-menu.react.js b/native/profile/tunnelbroker-menu.react.js
--- a/native/profile/tunnelbroker-menu.react.js
+++ b/native/profile/tunnelbroker-menu.react.js
@@ -95,10 +95,7 @@
         return;
       }
       await olmAPI.initializeCryptoAccount();
-      const encryptedData = await olmAPI.encrypt(
-        `Encrypted message to ${recipient}`,
-        recipient,
-      );
+      const encryptedData = await olmAPI.encrypt(message, recipient);
       const signingKey = await getContentSigningKey();
       const encryptedMessage: EncryptedMessage = {
         type: peerToPeerMessageTypes.ENCRYPTED_MESSAGE,
@@ -115,7 +112,7 @@
     } catch (e) {
       console.log(`Error sending encrypted content to device: ${e.message}`);
     }
-  }, [currentUserID, recipient, sendMessage]);
+  }, [message, currentUserID, recipient, sendMessage]);
 
   return (
     <ScrollView
diff --git a/web/settings/tunnelbroker-test.react.js b/web/settings/tunnelbroker-test.react.js
--- a/web/settings/tunnelbroker-test.react.js
+++ b/web/settings/tunnelbroker-test.react.js
@@ -61,10 +61,7 @@
       setLoading(true);
       try {
         await olmAPI.initializeCryptoAccount();
-        const encryptedData = await olmAPI.encrypt(
-          `Encrypted message to ${recipient}`,
-          recipient,
-        );
+        const encryptedData = await olmAPI.encrypt(message, recipient);
         const deviceID = await getContentSigningKey();
         const encryptedMessage: EncryptedMessage = {
           type: peerToPeerMessageTypes.ENCRYPTED_MESSAGE,
@@ -83,7 +80,7 @@
       }
       setLoading(false);
     },
-    [currentUserID, recipient, sendMessage],
+    [message, currentUserID, recipient, sendMessage],
   );
 
   let errorMsg;