diff --git a/VoidLink/HostCardView.m b/VoidLink/HostCardView.m
index 735a2b2c..d539d511 100644
--- a/VoidLink/HostCardView.m
+++ b/VoidLink/HostCardView.m
@@ -505,7 +505,7 @@ static const float REFRESH_CYCLE = 2.0f;
 }
 
 - (bool)isDarkTheme{
-    return self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark;
+    return ThemeManager.userInterfaceStyle == UIUserInterfaceStyleDark;
 }
 
 - (void) updateLoop {
diff --git a/VoidLink/ThemeManager.m b/VoidLink/ThemeManager.m
index d4da5d8c..9b1b3523 100644
--- a/VoidLink/ThemeManager.m
+++ b/VoidLink/ThemeManager.m
@@ -34,10 +34,10 @@ static UIUserInterfaceStyle _userInterfaceStyle;
 }
 
 + (void)setUserInterfaceStyle:(UIUserInterfaceStyle)style {
+    _privateUserInterfaceStyle = style;
     if (_userInterfaceStyle == style) {
         return;
     }
-    _privateUserInterfaceStyle = style;
     [ThemeManager setPublicUIStyle];
     [[NSNotificationCenter defaultCenter] postNotificationName:ThemeDidChangeNotification object:nil];
 }