diff --git a/Changes b/Changes
index 12f13c03d..832c9dcc1 100644
--- a/Changes
+++ b/Changes
@@ -1185,3 +1185,4 @@ v- Fixed some bugreport stuff
   -- upon unload. Will show a "3" in flags.
 - Added extras/m_rawto.c - 3rd party module. Fixed some documentation
 - Added andi's OpenBSD fix for the symbol issue with prefix _
+- Added SJOIN fix so it won't accept NULL channels
diff --git a/src/channel.c b/src/channel.c
index dcbabb14b..3994cd0ab 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -5162,7 +5162,11 @@ CMD_FUNC(m_sjoin)
 		if (((i + 1) <= (parc - 2)))
 			strcat(parabuf, " ");
 	}
-
+	if (!chptr->users)
+	{
+		sub1_from_channel(chptr);
+		return -1;
+	}
 	/* This sends out to SJ3 servers .. */
 	Debug((DEBUG_DEBUG, "Sending '%li %s :%s' to sj3-!sjb64", ts, parabuf,
 	    parv[parc - 1]));