diff --git a/rehlds/HLTV/Core/src/BSPModel.cpp b/rehlds/HLTV/Core/src/BSPModel.cpp
index 15f091d..65892bc 100644
--- a/rehlds/HLTV/Core/src/BSPModel.cpp
+++ b/rehlds/HLTV/Core/src/BSPModel.cpp
@@ -170,7 +170,7 @@ byte *BSPModel::LeafPVS(mleaf_t *leaf)
 
 byte *BSPModel::DecompressVis(unsigned char *in)
 {
-	static unsigned char decompressed[MODEL_MAX_PVS];
+	static unsigned char decompressed[MAX_MAP_LEAFS / 8];
 	if (in == nullptr) {
 		return m_novis;
 	}
diff --git a/rehlds/HLTV/Core/src/BSPModel.h b/rehlds/HLTV/Core/src/BSPModel.h
index 259960f..1ceb8df 100644
--- a/rehlds/HLTV/Core/src/BSPModel.h
+++ b/rehlds/HLTV/Core/src/BSPModel.h
@@ -32,6 +32,7 @@
 
 #include "l_studio.h"
 #include "edict.h"
+#include "bspfile.h"
 
 // values for model_t's needload
 #define NL_PRESENT      0
@@ -87,9 +88,7 @@ private:
 
 protected:
 	model_t m_model;
-
-	enum { MODEL_MAX_PVS = 1024 };
-	byte m_novis[MODEL_MAX_PVS];
+	byte m_novis[MAX_MAP_LEAFS / 8];
 	byte *m_base;
 
 	int m_visframecount;
diff --git a/rehlds/engine/cmodel.cpp b/rehlds/engine/cmodel.cpp
index 1e48512..3236e1b 100644
--- a/rehlds/engine/cmodel.cpp
+++ b/rehlds/engine/cmodel.cpp
@@ -31,17 +31,17 @@
 unsigned char *gPAS;
 unsigned char *gPVS;
 int gPVSRowBytes;
-unsigned char mod_novis[MODEL_MAX_PVS];
+unsigned char mod_novis[MAX_MAP_LEAFS / 8];
 
 void Mod_Init(void)
 {
 	SW_Mod_Init();
-	Q_memset(mod_novis, 255, MODEL_MAX_PVS);
+	Q_memset(mod_novis, 0xFF, MAX_MAP_LEAFS / 8);
 }
 
 unsigned char *Mod_DecompressVis(unsigned char *in, model_t *model)
 {
-	static unsigned char decompressed[MODEL_MAX_PVS];
+	static unsigned char decompressed[MAX_MAP_LEAFS / 8];
 
 	if (in == NULL)
 	{
diff --git a/rehlds/engine/cmodel.h b/rehlds/engine/cmodel.h
index 5b8d5eb..dd99cec 100644
--- a/rehlds/engine/cmodel.h
+++ b/rehlds/engine/cmodel.h
@@ -29,15 +29,10 @@
 #pragma once
 
 #include "maintypes.h"
-#include "model.h"
-
-// Looks like no more than 8096 visibility leafs per world model
-const int MODEL_MAX_PVS = 1024;
 
 extern unsigned char *gPAS;
 extern unsigned char *gPVS;
 extern int gPVSRowBytes;
-extern unsigned char mod_novis[MODEL_MAX_PVS];
 
 void Mod_Init(void);
 unsigned char *Mod_DecompressVis(unsigned char *in, model_t *model);
diff --git a/rehlds/engine/server.h b/rehlds/engine/server.h
index 2b10515..4bdd7ef 100644
--- a/rehlds/engine/server.h
+++ b/rehlds/engine/server.h
@@ -405,7 +405,6 @@ enum GameType_e
 
 extern GameType_e g_eGameType;
 
-extern int fatbytes;
 extern int giNextUserMsg;
 extern int hashstrings_collisions;
 
@@ -418,10 +417,6 @@ extern delta_t *g_pweapondelta;
 extern delta_t *g_pusercmddelta;
 #endif
 
-extern unsigned char fatpvs[1024];
-extern int fatpasbytes;
-extern unsigned char fatpas[1024];
-
 extern int gPacketSuppressed;
 
 extern char localinfo[MAX_LOCALINFO];
diff --git a/rehlds/engine/sv_main.cpp b/rehlds/engine/sv_main.cpp
index cb67538..83a3e3c 100644
--- a/rehlds/engine/sv_main.cpp
+++ b/rehlds/engine/sv_main.cpp
@@ -4030,9 +4030,10 @@ void SV_EmitEvents_internal(client_t *cl, packet_entities_t *pack, sizebuf_t *ms
 }
 
 int fatbytes;
-unsigned char fatpvs[1024];
+unsigned char fatpvs[MAX_MAP_LEAFS / 8];
+
 int fatpasbytes;
-unsigned char fatpas[1024];
+unsigned char fatpas[MAX_MAP_LEAFS / 8];
 
 void SV_AddToFatPVS(vec_t *org, mnode_t *node)
 {
@@ -4074,6 +4075,9 @@ unsigned char* EXT_FUNC SV_FatPVS(float *org)
 #endif // REHLDS_FIXES
 		fatbytes = (g_psv.worldmodel->numleafs + 31) >> 3;
 
+	if (fatbytes >= (MAX_MAP_LEAFS / 8))
+		Sys_Error("%s: MAX_MAP_LEAFS limit exceeded\n", __func__);
+
 	Q_memset(fatpvs, 0, fatbytes);
 	SV_AddToFatPVS(org, g_psv.worldmodel->nodes);
 	return fatpvs;
@@ -4131,6 +4135,9 @@ unsigned char* EXT_FUNC SV_FatPAS(float *org)
 #endif // REHLDS_FIXES
 		fatpasbytes = (g_psv.worldmodel->numleafs + 31) >> 3;
 
+	if (fatpasbytes >= (MAX_MAP_LEAFS / 8))
+		Sys_Error("%s: MAX_MAP_LEAFS limit exceeded\n", __func__);
+
 	Q_memset(fatpas, 0, fatpasbytes);
 	SV_AddToFatPAS(org, g_psv.worldmodel->nodes);
 	return fatpas;
@@ -6155,7 +6162,7 @@ int SV_SpawnServer(qboolean bIsDemo, char *server, char *startspot)
 	if (g_psvs.maxclients <= 1)
 	{
 		int row = (g_psv.worldmodel->numleafs + 7) / 8;
-		if (row < 0 || row > MODEL_MAX_PVS)
+		if (row < 0 || row > (MAX_MAP_LEAFS / 8))
 		{
 			Sys_Error("%s: oversized g_psv.worldmodel->numleafs: %i", __func__, g_psv.worldmodel->numleafs);
 		}
diff --git a/rehlds/public/rehlds/bspfile.h b/rehlds/public/rehlds/bspfile.h
index 3c4dfee..c3a94bb 100644
--- a/rehlds/public/rehlds/bspfile.h
+++ b/rehlds/public/rehlds/bspfile.h
@@ -32,6 +32,7 @@
 #define HLBSP_VERSION		30		// half-life regular version
 
 #define MAX_MAP_HULLS		4
+#define MAX_MAP_LEAFS		8192	// signed short limit
 
 #define CONTENTS_ORIGIN		-7		// removed at csg time
 #define CONTENTS_CLIP		-8		// changed to contents_solid