diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
index b6764d7..251efa4 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
@@ -235,9 +235,12 @@ fun ChatDetailScreen(
         // UI Theme
         val backgroundColor = if (isDarkTheme) Color(0xFF1A1A1A) else Color(0xFFF2F2F7)
         val chatWallpaperResId = remember(chatWallpaperId) { ThemeWallpapers.drawableResOrNull(chatWallpaperId) }
+        val hasChatWallpaper = remember(chatWallpaperId, chatWallpaperResId) {
+                chatWallpaperId.isNotBlank() || chatWallpaperResId != null
+        }
         val textColor = if (isDarkTheme) Color.White else Color.Black
         val secondaryTextColor = if (isDarkTheme) Color(0xFF8E8E93) else Color(0xFF8E8E93)
-        val dateHeaderTextColor = if (isDarkTheme || chatWallpaperResId != null) Color.White else secondaryTextColor
+        val dateHeaderTextColor = if (isDarkTheme || hasChatWallpaper) Color.White else secondaryTextColor
         val headerIconColor = Color.White
 
         // 🔥 Keyboard & Emoji Coordinator
@@ -2588,8 +2591,7 @@ fun ChatDetailScreen(
                                                                                                 isDarkTheme =
                                                                                                         isDarkTheme,
                                                                                                 hasWallpaper =
-                                                                                                        chatWallpaperResId !=
-                                                                                                                null,
+                                                                                                        hasChatWallpaper,
                                                                                                 isSystemSafeChat =
                                                                                                         isSystemAccount,
                                                                                                 isSelectionMode =