diff --git a/src/sbbs3/un_qwk.cpp b/src/sbbs3/un_qwk.cpp
index 75b01edb087a37377fb3833d23618dacef6a8450..7b2f035f3377f8db528612eafab8395d6a3c4bc4 100644
--- a/src/sbbs3/un_qwk.cpp
+++ b/src/sbbs3/un_qwk.cpp
@@ -57,6 +57,10 @@ bool sbbs_t::unpack_qwk(char *packet,uint hubnum)
 	DIR*	dir;
 	DIRENT*	dirent;
 	FILE*	qwk;
+	BOOL	twit_list;
+
+	sprintf(fname,"%stwitlist.cfg",cfg.ctrl_dir);
+	twit_list=fexist(fname);
 
 	start=time(NULL);
 	if((l=flength(packet))<1) {
@@ -193,15 +197,18 @@ bool sbbs_t::unpack_qwk(char *packet,uint hubnum)
 		j=cfg.qhub[hubnum]->sub[j];
 
 		/* TWIT FILTER */
-		sprintf(fname,"%stwitlist.cfg",cfg.ctrl_dir);
-		sprintf(str,"%25.25s",block+46);  /* From user */
-		truncsp(str);
+		if(twit_list) {
+			sprintf(fname,"%stwitlist.cfg",cfg.ctrl_dir);
 
-		if(findstr(str,fname)) {
-			eprintf("!Filtering post from twit (%s) on %s %s"
-				,str
-				,cfg.grp[cfg.sub[j]->grp]->sname,cfg.sub[j]->lname); 
-			continue; 
+			sprintf(str,"%25.25s",block+46);  /* From user */
+			truncsp(str);
+
+			if(findstr(str,fname)) {
+				eprintf("!Filtering post from twit (%s) on %s %s"
+					,str
+					,cfg.grp[cfg.sub[j]->grp]->sname,cfg.sub[j]->lname); 
+				continue; 
+			}
 		}
 
 		if(j!=lastsub) {
diff --git a/src/sbbs3/un_rep.cpp b/src/sbbs3/un_rep.cpp
index 75f2389f1c56f3cb092c66b67b21f3aeeb344141..d62acc183f7fb3eef0c33a2951588611955434ad 100644
--- a/src/sbbs3/un_rep.cpp
+++ b/src/sbbs3/un_rep.cpp
@@ -57,6 +57,10 @@ bool sbbs_t::unpack_rep(char* repfile)
 	FILE*	rep;
 	DIR*	dir;
 	DIRENT*	dirent;
+	BOOL	twit_list;
+
+	sprintf(fname,"%stwitlist.cfg",cfg.ctrl_dir);
+	twit_list=fexist(fname);
 
 	if(repfile!=NULL)
 		strcpy(str,repfile);
@@ -336,15 +340,17 @@ bool sbbs_t::unpack_rep(char* repfile)
 															/* to user name */
 
 			/* TWIT FILTER */
-			sprintf(fname,"%stwitlist.cfg",cfg.ctrl_dir);
-			sprintf(str,"%25.25s",block+46);  /* From user */
-			truncsp(str);
-
-			if(findstr(str,fname)) {
-				sprintf(str,"Filtering post from twit (%s) on %s %s"
-					,str,cfg.grp[cfg.sub[n]->grp]->sname,cfg.sub[n]->lname);
-				logline("P!",str);
-				continue; 
+			if(twit_list) {
+				sprintf(fname,"%stwitlist.cfg",cfg.ctrl_dir);
+				sprintf(str,"%25.25s",block+46);  /* From user */
+				truncsp(str);
+
+				if(findstr(str,fname)) {
+					sprintf(str,"Filtering post from twit (%s) on %s %s"
+						,str,cfg.grp[cfg.sub[n]->grp]->sname,cfg.sub[n]->lname);
+					logline("P!",str);
+					continue; 
+				}
 			}
 
 			if(n!=lastsub) {