diff --git a/app/models/theme.rb b/app/models/theme.rb
index 7daeb4b9393..9fd4b9ec726 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -367,7 +367,7 @@ class Theme < ActiveRecord::Base
   end
 
   def internal_translations
-    translations(internal: true)
+    @internal_translations ||= translations(internal: true)
   end
 
   def translations(internal: false)
diff --git a/app/serializers/theme_settings_serializer.rb b/app/serializers/theme_settings_serializer.rb
index 316a403f045..92f41cf6812 100644
--- a/app/serializers/theme_settings_serializer.rb
+++ b/app/serializers/theme_settings_serializer.rb
@@ -21,7 +21,8 @@ class ThemeSettingsSerializer < ApplicationSerializer
   end
 
   def description
-    object.description
+    locale_file_description = object.theme.internal_translations.find  { |t| t.key == "theme_metadata.settings.#{setting}" } &.value
+    locale_file_description || object.description
   end
 
   def valid_values
@@ -33,7 +34,7 @@ class ThemeSettingsSerializer < ApplicationSerializer
   end
 
   def include_description?
-    object.description.present?
+    description.present?
   end
 
   def list_type
diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rb
index ec19e42c9d0..cc69dee04e6 100644
--- a/lib/theme_settings_manager.rb
+++ b/lib/theme_settings_manager.rb
@@ -34,7 +34,7 @@ class ThemeSettingsManager
   end
 
   def description
-    @opts[:description]
+    @opts[:description] # Old method of specifying description. Is now overridden by locale file
   end
 
   def value=(new_value)