diff --git a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt
index b5592ecceb..e5555bf477 100644
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt
@@ -18,6 +18,7 @@ package io.element.android.x.features.messages.textcomposer
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import io.element.android.x.designsystem.LocalIsDarkTheme
 import io.element.android.x.textcomposer.TextComposer
 
 @Composable
@@ -50,6 +51,7 @@ fun MessageComposerView(
         onComposerTextChange = ::onComposerTextChange,
         composerCanSendMessage = state.isSendButtonVisible,
         composerText = state.text?.charSequence?.toString(),
+        isInDarkMode = LocalIsDarkTheme.current,
         modifier = modifier
     )
 }
diff --git a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt
index 8bb7aea485..6dbc649acb 100644
--- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt
@@ -18,7 +18,6 @@ package io.element.android.x.textcomposer
 
 import android.graphics.Color
 import android.net.Uri
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -42,6 +41,7 @@ fun TextComposer(
     composerText: String?,
     composerMode: MessageComposerMode,
     composerCanSendMessage: Boolean,
+    isInDarkMode: Boolean,
     modifier: Modifier = Modifier,
     onSendMessage: (String) -> Unit = {},
     onFullscreenToggle: () -> Unit = {},
@@ -51,7 +51,6 @@ fun TextComposer(
     if (LocalInspectionMode.current) {
         FakeComposer(modifier)
     } else {
-        val isInDarkMode = isSystemInDarkTheme()
         AndroidView(
             modifier = modifier,
             factory = { context ->
@@ -156,5 +155,6 @@ fun TextComposerPreview() {
         onCloseSpecialMode = {},
         composerCanSendMessage = true,
         composerText = "Message",
+        isInDarkMode = true,
     )
 }