diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index caf34f62002..f1ca2e3110e 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -170,7 +170,11 @@ class SiteSettings::TypeSupervisor
       if enum_class(name)
         raise Discourse::InvalidParameters.new(:value) unless enum_class(name).valid_value?(val)
       else
-        raise Discourse::InvalidParameters.new(:value) unless @choices[name].include?(val)
+        unless (choice = @choices[name])
+          raise Discourse::InvalidParameters.new(name)
+        end
+
+        raise Discourse::InvalidParameters.new(:value) unless choice.include?(val)
       end
     end