diff --git a/CHANGES.md b/CHANGES.md
index 12d4d7a2ca..2c7e734600 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Bugfix 🐛:
  - After jump to unread, newer messages are never loaded (#1008)
  - Fix issues with FontScale switch (#69, #645)
  - "Seen by" uses 12h time (#1378)
+ - Enable markdown (if active) when sending emote (#734)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
index 4a767a178e..df6f46b431 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt
@@ -117,8 +117,10 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     // Slot to keep a pending action during permission request
     var pendingAction: RoomDetailAction? = null
+
     // Slot to keep a pending uri during permission request
     var pendingUri: Uri? = null
+
     // Slot to store if we want to prevent preview of attachment
     var preventAttachmentPreview = false
 
@@ -390,7 +392,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandNotImplemented)
                         }
                         is ParsedCommand.SendEmote                -> {
-                            room.sendTextMessage(slashCommandResult.message, msgType = MessageType.MSGTYPE_EMOTE)
+                            room.sendTextMessage(slashCommandResult.message, msgType = MessageType.MSGTYPE_EMOTE, autoMarkdown = action.autoMarkdown)
                             _viewEvents.post(RoomDetailViewEvents.SlashCommandHandled())
                             popDraft()
                         }