diff --git a/presage/src/manager/registered.rs b/presage/src/manager/registered.rs
index ca1507221..c6d402c7d 100644
--- a/presage/src/manager/registered.rs
+++ b/presage/src/manager/registered.rs
@@ -792,7 +792,10 @@ impl<S: Store> Manager<S, Registered> {
         let mut sender = self.new_message_sender().await?;
 
         let online_only = false;
-        let include_pni_signature = true;
+        // TODO: Populate this flag based on the recipient information
+        //
+        // Issue <https://github.com/whisperfish/presage/issues/252>
+        let include_pni_signature = false;
         let recipient = recipient_addr.into();
         let mut content_body: ContentBody = message.into();