diff --git a/matrix_sdk/src/base_client.rs b/matrix_sdk/src/base_client.rs
index 8a798ac2..a7868fa5 100644
--- a/matrix_sdk/src/base_client.rs
+++ b/matrix_sdk/src/base_client.rs
@@ -532,12 +532,15 @@ impl Client {
     ) -> Result<MessageEventContent> {
         let mut olm = self.olm.lock().await;
 
-        match &mut *olm {
-            Some(o) => Ok(MessageEventContent::Encrypted(
-                o.encrypt(room_id, content).await?,
-            )),
-            None => panic!("Olm machine wasn't started"),
-        }
+        // TODO enable this again once we can send encrypted event
+        // contents with ruma.
+        // match &mut *olm {
+        //     Some(o) => Ok(MessageEventContent::Encrypted(
+        //         o.encrypt(room_id, content).await?,
+        //     )),
+        //     None => panic!("Olm machine wasn't started"),
+        // }
+        Ok(content)
     }
 
     /// Get a tuple of device and one-time keys that need to be uploaded.
diff --git a/matrix_sdk_crypto/src/machine.rs b/matrix_sdk_crypto/src/machine.rs
index 7db37b0d..e5dae2eb 100644
--- a/matrix_sdk_crypto/src/machine.rs
+++ b/matrix_sdk_crypto/src/machine.rs
@@ -1290,10 +1290,12 @@ impl OlmMachine {
                     )
                     .await?;
 
-                user_messages.insert(
-                    DeviceIdOrAllDevices::DeviceId(device.device_id().clone()),
-                    EventJson::from(MessageEventContent::Encrypted(encrypted_content)),
-                );
+                // TODO enable this again once we can send encrypted event
+                // contents with ruma.
+                // user_messages.insert(
+                //     DeviceIdOrAllDevices::DeviceId(device.device_id().clone()),
+                //     EventJson::from(MessageEventContent::Encrypted(encrypted_content)),
+                // );
             }
 
             message_vec.push(ToDeviceRequest {