diff --git a/plugins/chat/lib/chat/user_option_extension.rb b/plugins/chat/lib/chat/user_option_extension.rb
index 71e860ebb25..30b0ad8126f 100644
--- a/plugins/chat/lib/chat/user_option_extension.rb
+++ b/plugins/chat/lib/chat/user_option_extension.rb
@@ -18,8 +18,13 @@ module Chat
         @chat_header_indicator_preferences ||= { all_new: 0, dm_and_mentions: 1, never: 2 }
       end
 
-      base.enum :chat_email_frequency, base.chat_email_frequencies, prefix: "send_chat_email"
-      base.enum :chat_header_indicator_preference, base.chat_header_indicator_preferences
+      if !base.method_defined?(:send_chat_email_never?) # Avoid attempting to override when autoloading
+        base.enum :chat_email_frequency, base.chat_email_frequencies, prefix: "send_chat_email"
+      end
+
+      if !base.method_defined?(:never?) # Avoid attempting to override when autoloading
+        base.enum :chat_header_indicator_preference, base.chat_header_indicator_preferences
+      end
     end
   end
 end