diff --git a/src/rtech/pak/pakstate.cpp b/src/rtech/pak/pakstate.cpp
index 9eb2fa0f..384c7c5f 100644
--- a/src/rtech/pak/pakstate.cpp
+++ b/src/rtech/pak/pakstate.cpp
@@ -22,7 +22,7 @@ static void Pak_ListPaks_f()
 
 	uint32_t numLoaded = 0;
 
-	for (int16_t i = 0, n = g_pakGlobals->loadedPakCount; i < n; ++i)
+	for (uint16_t i = 0, n = PAK_MAX_LOADED_PAKS; i < n; ++i)
 	{
 		const PakLoadedInfo_s& info = g_pakGlobals->loadedPaks[i];
 
diff --git a/src/rtech/pak/paktools.cpp b/src/rtech/pak/paktools.cpp
index 646ff81f..d4c8de5d 100644
--- a/src/rtech/pak/paktools.cpp
+++ b/src/rtech/pak/paktools.cpp
@@ -263,7 +263,7 @@ PakLoadedInfo_s* Pak_GetPakInfo(const PakHandle_t pakId)
 //-----------------------------------------------------------------------------
 const PakLoadedInfo_s* Pak_GetPakInfo(const char* const pakName)
 {
-	for (int16_t i = 0; i < g_pakGlobals->loadedPakCount; ++i)
+	for (int16_t i = 0; i < PAK_MAX_LOADED_PAKS; ++i)
 	{
 		const PakLoadedInfo_s* const info = &g_pakGlobals->loadedPaks[i];
 		if (!info)