diff --git a/lib/matrix_sdk/bot/base.rb b/lib/matrix_sdk/bot/base.rb
index 289caf2bb5a3c71adc9ea2035f050a157fdf0019..f289d64d0fd8ca99cee44e2f832b6fa32f5a1f49 100644
--- a/lib/matrix_sdk/bot/base.rb
+++ b/lib/matrix_sdk/bot/base.rb
@@ -686,6 +686,8 @@ module MatrixSdk::Bot
 
       handler = get_command(command)
       return unless handler
+
+      event = event.data if event.is_a? MatrixSdk::MatrixEvent
       return unless command_allowed?(command, event)
 
       @event = MatrixSdk::Response.new(client.api, event)
diff --git a/lib/matrix_sdk/room.rb b/lib/matrix_sdk/room.rb
index 301dfe653d3ddc4994e240ab2d2c011b65c93f55..897258d744d218af34aa7dc3df3434d15a11bf02 100644
--- a/lib/matrix_sdk/room.rb
+++ b/lib/matrix_sdk/room.rb
@@ -454,7 +454,7 @@ module MatrixSdk
     #   :content key of the resulting event object
     # @see Protocols::CS#send_message_event
     def send_event(type, content = {})
-      client.api.send_message_event(room.id, type, content)
+      client.api.send_message_event(id, type, content)
     end
 
     # Redacts a message from the room