diff --git a/modules/m_set.c b/modules/m_set.c
index 066fdb29d..88e079a18 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -379,6 +379,7 @@ quote_splitmode(struct Client *source_p, const char *charval, int intval)
 			splitchecking = 0;
 
 			rb_event_delete(check_splitmode_ev);
+			check_splitmode_ev = NULL;
 		}
 		/* ON */
 		else if(newval == 1)
@@ -392,6 +393,7 @@ quote_splitmode(struct Client *source_p, const char *charval, int intval)
 
 			/* we might be deactivating an automatic splitmode, so pull the event */
 			rb_event_delete(check_splitmode_ev);
+			check_splitmode_ev = NULL;
 		}
 		/* AUTO */
 		else if(newval == 2)
diff --git a/src/channel.c b/src/channel.c
index a8f34fb93..e3e2c060b 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -995,6 +995,7 @@ check_splitmode(void *unused)
 					     "Network rejoined, deactivating splitmode");
 
 			rb_event_delete(check_splitmode_ev);
+			check_splitmode_ev = NULL;
 		}
 	}
 }