diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift
index a6b918e8f..c9268a075 100755
--- a/Riot/Modules/Application/AppCoordinator.swift
+++ b/Riot/Modules/Application/AppCoordinator.swift
@@ -111,9 +111,9 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
                 MXLog.error("[AppCoordinator] No theme id found to update ThemePublisher")
             }
             
-            // Always republish theme change events
+            // Always republish theme change events, and again always getting the identifier from the theme.
             let themeIdPublisher = NotificationCenter.default.publisher(for: Notification.Name.themeServiceDidChangeTheme)
-                .compactMap({ _ in ThemeService.shared().themeIdentifier })
+                .compactMap({ _ in ThemeIdentifier(rawValue: ThemeService.shared().theme.identifier) })
                 .eraseToAnyPublisher()
 
             ThemePublisher.shared.republish(themeIdPublisher: themeIdPublisher)