diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index 9679315421..cdb26216ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -700,8 +700,10 @@ class ConversationFragment :
   override fun onResume() {
     super.onResume()
 
-    WindowUtil.setLightNavigationBarFromTheme(requireActivity())
-    WindowUtil.setLightStatusBarFromTheme(requireActivity())
+    if (!WindowSizeClass.isLargeScreenSupportEnabled()) {
+      WindowUtil.setLightNavigationBarFromTheme(requireActivity())
+      WindowUtil.setLightStatusBarFromTheme(requireActivity())
+    }
 
     EventBus.getDefault().register(this)
 
@@ -3433,8 +3435,10 @@ class ConversationFragment :
                   getVoiceNoteMediaController().resumePlayback(selectedConversationModel.audioUri, messageRecord.id)
                 }
 
-                WindowUtil.setLightStatusBarFromTheme(requireActivity())
-                WindowUtil.setLightNavigationBarFromTheme(requireActivity())
+                if (!WindowSizeClass.isLargeScreenSupportEnabled()) {
+                  WindowUtil.setLightStatusBarFromTheme(requireActivity())
+                  WindowUtil.setLightNavigationBarFromTheme(requireActivity())
+                }
 
                 clearFocusedItem()