diff --git a/app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt b/app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt
index 69fa8c55..a897510d 100644
--- a/app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt
+++ b/app/src/main/java/chat/revolt/components/markdown/RichMarkdown.kt
@@ -3,11 +3,19 @@ package chat.revolt.components.markdown
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import chat.revolt.api.settings.Experiments
+import chat.revolt.markdown.jbm.JBM
+import chat.revolt.markdown.jbm.JBMRenderer
 import chat.revolt.ndk.Stendal
 
+@OptIn(JBM::class)
 @Composable
 fun RichMarkdown(input: String, modifier: Modifier = Modifier) {
     Column(modifier) {
-        MarkdownTree(node = Stendal.render(input))
+        if (Experiments.useKotlinBasedMarkdownRenderer.isEnabled) {
+            JBMRenderer(input)
+        } else {
+            MarkdownTree(node = Stendal.render(input))
+        }
     }
 }
\ No newline at end of file