diff --git a/Source/stores.cpp b/Source/stores.cpp
index 62bb06495..938497b1a 100644
--- a/Source/stores.cpp
+++ b/Source/stores.cpp
@@ -1377,7 +1377,7 @@ void S_StartTalk()
 	AddSText(0, 16, 1, "version", COL_WHITE, 0);
 #else
 	sn = 0;
-	for (i = 0; i < 16; i++) {
+	for (i = 0; i < MAXQUESTS; i++) {
 		if (quests[i]._qactive == 2 && ((DWORD *)&Qtalklist[talker])[i] != -1 && quests[i]._qlog)
 			sn++;
 	}
@@ -1392,7 +1392,7 @@ void S_StartTalk()
 
 	sn2 = sn - 2;
 
-	for (i = 0; i < 16; i++) {
+	for (i = 0; i < MAXQUESTS; i++) {
 		if (quests[i]._qactive == 2 && ((DWORD *)&Qtalklist[talker])[i] != -1 && quests[i]._qlog) {
 			AddSText(0, sn, 1, questlist[i]._qlstr, COL_WHITE, 1);
 			sn += la;
@@ -2593,7 +2593,7 @@ void S_TalkEnter()
 	}
 
 	sn = 0;
-	for (i = 0; i < 16; i++) {
+	for (i = 0; i < MAXQUESTS; i++) {
 		if (quests[i]._qactive == 2 && ((DWORD *)&Qtalklist[talker])[i] != -1 && quests[i]._qlog)
 			sn++;
 	}
@@ -2612,7 +2612,7 @@ void S_TalkEnter()
 		return;
 	}
 
-	for (i = 0; i < 16; i++) {
+	for (i = 0; i < MAXQUESTS; i++) {
 		if (quests[i]._qactive == 2 && ((DWORD *)&Qtalklist[talker])[i] != -1 && quests[i]._qlog) {
 			if (sn == stextsel) {
 				InitQTextMsg(((DWORD *)&Qtalklist[talker])[i]);
diff --git a/Source/towners.cpp b/Source/towners.cpp
index e39be8e2a..da56af303 100644
--- a/Source/towners.cpp
+++ b/Source/towners.cpp
@@ -182,7 +182,7 @@ void InitQstSnds(int i)
 	tl = i;
 	if (boyloadflag)
 		tl++;
-	for (j = 0; j < 16; j++) {
+	for (j = 0; j < MAXQUESTS; j++) {
 		towner[i].qsts[j]._qsttype = quests[j]._qtype;
 		towner[i].qsts[j]._qstmsg = ((int *)(Qtalklist + tl))[j];
 		if (((int *)(Qtalklist + tl))[j] != -1)