diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
index 3ad293e9f..83cf94d61 100644
--- a/src/game/mplayer/mplayer.c
+++ b/src/game/mplayer/mplayer.c
@@ -1154,7 +1154,11 @@ void mpApplyWeaponSet(void)
 			mpSetWeaponSlot(i, random() % numoptions + 1);
 		}
 
+#ifndef PLATFORM_N64 // take into account the new classic weapons slots
+		mpSetWeaponSlot(i, MPWEAPON_DISABLED - 1);
+#else
 		mpSetWeaponSlot(i, mpGetNumWeaponOptions() - 1);
+#endif
 	}
 }