diff --git a/Changes b/Changes
index ab0babe1a..12ce8e2d1 100644
--- a/Changes
+++ b/Changes
@@ -1759,3 +1759,4 @@ seen. gmtime warning still there
   reported by AngryWolf (#0000596)
 - Fixed whole bunch of users in empty channel bug (probably)
 - Added a patch by Syzop to increase the "randomness" of well... the random numbers
+- Fixed a bug in the empty channel fix
diff --git a/src/channel.c b/src/channel.c
index 5c1aa6cd2..a780ec98e 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2624,7 +2624,7 @@ static void sub1_from_channel(aChannel *chptr)
 	 * someone doesn't remember what -- does when
 	 * preceding a variable.
         if (--chptr->users <= 0) */
-        if (chptr->users-- == 0)
+	if (chptr->users == 0 || --chptr->users == 0)
 	{
 		/*
 		 * Now, find all invite links from channel structure