diff --git a/SignalMessaging/categories/UIColor+OWS.h b/SignalMessaging/categories/UIColor+OWS.h
index 236aad6e5..c31fb084d 100644
--- a/SignalMessaging/categories/UIColor+OWS.h
+++ b/SignalMessaging/categories/UIColor+OWS.h
@@ -85,8 +85,8 @@ extern NSString *const NSNotificationNameThemeDidChange;
 
 #pragma mark - Theme
 
-#ifdef THEME_ENABLED
 + (BOOL)isThemeEnabled;
+#ifdef THEME_ENABLED
 + (void)setIsThemeEnabled:(BOOL)value;
 #endif
 
diff --git a/SignalMessaging/categories/UIColor+OWS.m b/SignalMessaging/categories/UIColor+OWS.m
index 6f92a6fa4..22c242908 100644
--- a/SignalMessaging/categories/UIColor+OWS.m
+++ b/SignalMessaging/categories/UIColor+OWS.m
@@ -355,9 +355,13 @@ NSString *const UIColorKeyThemeEnabled = @"UIColorKeyThemeEnabled";
 {
     OWSAssertIsOnMainThread();
 
+#ifdef THEME_ENABLED
+    return NO;
+#else
     return [OWSPrimaryStorage.sharedManager.dbReadConnection boolForKey:UIColorKeyThemeEnabled
                                                            inCollection:UIColorCollection
                                                            defaultValue:NO];
+#endif
 }
 
 + (void)setIsThemeEnabled:(BOOL)value