diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index bdd2df1d..f5edea23 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -100,8 +100,8 @@ check_forward(struct Client *source_p, struct Channel *chptr,
 	if ((*err = can_join(source_p, chptr, key, &next)) == 0)
 		return chptr;
 
-	/* User is +Q */
-	if (IsNoForward(source_p))
+	/* User is +Q, or forwarding disabled */
+	if (IsNoForward(source_p) || !ConfigChannel.use_forward)
 		return NULL;
 
 	while (depth < 16)