diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/MessagesScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/MessagesScreen.kt
index f38fcbc57..404d170f2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/MessagesScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/MessagesScreen.kt
@@ -43,7 +43,7 @@ fun MessagesScreen(
     val act = LocalContext.current.getActivity()
     val windowSizeClass = calculateWindowSizeClass(act)
 
-    val twoPane by remember {
+    val twoPane by remember(windowSizeClass.widthSizeClass) {
         derivedStateOf {
             when (windowSizeClass.widthSizeClass) {
                 WindowWidthSizeClass.Compact -> false