diff --git a/Riot/Managers/Theme/ThemeService.m b/Riot/Managers/Theme/ThemeService.m
index 819924d59..06deab82b 100644
--- a/Riot/Managers/Theme/ThemeService.m
+++ b/Riot/Managers/Theme/ThemeService.m
@@ -63,8 +63,15 @@ NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChan
 
     if ([themeId isEqualToString:@"auto"])
     {
-        // Translate "auto" into a theme
-        themeId = UIAccessibilityIsInvertColorsEnabled() ? @"dark" : @"light";
+        if (@available(iOS 13, *))
+        {
+            themeId = ([UITraitCollection currentTraitCollection].userInterfaceStyle == UIUserInterfaceStyleDark) ? @"dark" : @"light";
+        }
+        else
+        {
+            // Translate "auto" into a theme
+            themeId = UIAccessibilityIsInvertColorsEnabled() ? @"dark" : @"light";
+        }
     }
 
     if ([themeId isEqualToString:@"dark"])