diff --git a/rehlds/engine/server.h b/rehlds/engine/server.h
index 801dcf3..3f89cee 100644
--- a/rehlds/engine/server.h
+++ b/rehlds/engine/server.h
@@ -161,6 +161,7 @@ struct rehlds_server_t {
 	// Extended net buffers
 	uint8_t reliableDatagramBuffer[NET_MAX_PAYLOAD];
 	uint8_t signonData[NET_MAX_PAYLOAD];
+	uint8_t spectatorBuffer[MAX_DATAGRAM];
 
 	// Extended resource list
 	resource_t resources[RESOURCE_MAX_COUNT];
diff --git a/rehlds/engine/sv_main.cpp b/rehlds/engine/sv_main.cpp
index 47100fb..badf577 100644
--- a/rehlds/engine/sv_main.cpp
+++ b/rehlds/engine/sv_main.cpp
@@ -5921,6 +5921,9 @@ int SV_SpawnServer(qboolean bIsDemo, char *server, char *startspot)
 	g_psv.datagram.data = g_psv.datagram_buf;
 	g_psv.datagram.maxsize = sizeof(g_psv.datagram_buf);
 	g_psv.datagram.cursize = 0;
+#ifdef REHLDS_FIXES
+	g_psv.datagram.flags = SIZEBUF_ALLOW_OVERFLOW;
+#endif
 
 	g_psv.reliable_datagram.buffername = "Server Reliable Datagram";
 #ifdef REHLDS_FIXES
@@ -5933,8 +5936,14 @@ int SV_SpawnServer(qboolean bIsDemo, char *server, char *startspot)
 	g_psv.reliable_datagram.cursize = 0;
 
 	g_psv.spectator.buffername = "Server Spectator Buffer";
+#ifdef REHLDS_FIXES
+	g_psv.spectator.data = g_rehlds_sv.spectatorBuffer;
+	g_psv.spectator.maxsize = sizeof(g_rehlds_sv.spectatorBuffer);
+	g_psv.spectator.flags = SIZEBUF_ALLOW_OVERFLOW;
+#else
 	g_psv.spectator.data = g_psv.spectator_buf;
 	g_psv.spectator.maxsize = sizeof(g_psv.spectator_buf);
+#endif
 
 	g_psv.multicast.buffername = "Server Multicast Buffer";
 	g_psv.multicast.data = g_psv.multicast_buf;