diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb
index 517357d59..4b41a24c2 100644
--- a/lib/freedom_patches/translate_accelerator.rb
+++ b/lib/freedom_patches/translate_accelerator.rb
@@ -106,13 +106,19 @@ module I18n
 
       by_site = @overrides_by_site[site]
 
-      unless by_site && by_site.has_key?(locale)
+      if by_site.nil? || !by_site.has_key?(locale)
         by_site = @overrides_by_site[site] = {}
 
         # Load overrides
-        TranslationOverride.where(locale: locale).pluck(:translation_key, :value).each do |tuple|
-          by_locale = by_site[locale] ||= {}
-          by_locale[tuple[0]] = tuple[1]
+        translations_overrides = TranslationOverride.where(locale: locale).pluck(:translation_key, :value)
+
+        if translations_overrides.empty?
+          by_site[locale] = {}
+        else
+          translations_overrides.each do |tuple|
+            by_locale = by_site[locale] ||= {}
+            by_locale[tuple[0]] = tuple[1]
+          end
         end
       end