diff --git a/src/Chat.c b/src/Chat.c
index 962ae9139..934230447 100644
--- a/src/Chat.c
+++ b/src/Chat.c
@@ -610,7 +610,9 @@ static void Chat_Init(void) {
 	Commands_Register(&TeleportCommand);
 	Commands_Register(&ClearDeniedCommand);
 
+#ifndef CC_BUILD_MINFILES
 	Chat_Logging = Options_GetBool(OPT_CHAT_LOGGING, true);
+#endif
 }
 
 static void Chat_Reset(void) {
diff --git a/src/Menus.c b/src/Menus.c
index 47c9eb6f3..a0265d808 100644
--- a/src/Menus.c
+++ b/src/Menus.c
@@ -2627,6 +2627,11 @@ static void ChatOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) {
 
 	s->numWidgets = 4 + MENUOPTIONS_CORE_WIDGETS;
 	MenuOptionsScreen_InitButtons(s, buttons, Array_Elems(buttons), Menu_SwitchOptions);
+
+	/* If MINFILES is defined, chat logging code is not even included at all */
+#ifdef CC_BUILD_MINFILES
+	s->buttons[2].disabled = true;
+#endif
 }
 
 void ChatOptionsScreen_Show(void) {