diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
index c2bfa15e..02d29a24 100644
--- a/code/renderer/tr_local.h
+++ b/code/renderer/tr_local.h
@@ -1189,11 +1189,11 @@ the bits are allocated as follows:
 2-6   : fog index
 0-1   : dlightmap index
 */
-#define	QSORT_SHADERNUM_SHIFT	21 // was 22, decreased in 2.0
+#define	QSORT_SHADERNUM_SHIFT	21 // was 22, decreased in 2.30
 #define	QSORT_ENTITYNUM_SHIFT	8
 #define	QSORT_FOGNUM_SHIFT		2
 #define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.0
+#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.30
 
 extern	int			gl_filter_min, gl_filter_max;
 
diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
index 96a7445f..899581fd 100644
--- a/code/renderer/tr_main.c
+++ b/code/renderer/tr_main.c
@@ -1384,7 +1384,7 @@ R_DecomposeSort
 */
 void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel) {
 	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
-	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 1023;
+	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 4095;
 	*dlightMap = sort & 15;
 	*bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
 }