diff --git a/src/mn_setup.c b/src/mn_setup.c
index eace67fc..dbe8c12d 100644
--- a/src/mn_setup.c
+++ b/src/mn_setup.c
@@ -1278,7 +1278,7 @@ static setup_menu_t weap_settings2[] = {
     {"Use Weapon Toggles", S_ONOFF | S_BOOM, M_X, M_SPC, {"doom_weapon_toggles"}},
     MI_GAP,
     // killough 8/8/98
-    {"Pre-Beta BFG", S_ONOFF, M_X, M_SPC, {"classic_bfg"}},
+    {"Pre-Beta BFG", S_ONOFF | S_STRICT, M_X, M_SPC, {"classic_bfg"}},
     MI_END
 };
 
diff --git a/src/p_inter.c b/src/p_inter.c
index 43890dc0..7405bc83 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -593,7 +593,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
     case SPR_BFUG:
       if (!P_GiveWeapon (player, wp_bfg, false) )
         return;
-      if (classic_bfg || beta_emulation)
+      if (STRICTMODE(classic_bfg) || beta_emulation)
         pickupmsg(player, "You got the BFG2704!  Oh, yes."); // killough 8/9/98: beta BFG
       else
         pickupmsg(player, "%s", s_GOTBFG9000); // Ty 03/22/98 - externalized
diff --git a/src/p_pspr.c b/src/p_pspr.c
index 4214b89a..81b452bf 100644
--- a/src/p_pspr.c
+++ b/src/p_pspr.c
@@ -111,7 +111,7 @@ void P_SetPspritePtr(player_t *player, pspdef_t *psp, statenum_t stnum)
         }
 
       // killough 7/19/98: Pre-Beta BFG
-      if (stnum == S_BFG1 && (classic_bfg || beta_emulation))
+      if (stnum == S_BFG1 && (STRICTMODE(classic_bfg) || beta_emulation))
 	stnum = S_OLDBFG1;                 // Skip to alternative weapon frame
 
       state = &states[stnum];