diff --git a/window.c b/window.c
index 704c7a16..34214e71 100644
--- a/window.c
+++ b/window.c
@@ -649,7 +649,8 @@ window_pane_destroy(struct window_pane *wp)
 {
 	window_pane_reset_mode(wp);
 
-	event_del(&wp->changes_timer);
+	if (event_initialized(&wp->changes_timer))
+		evtimer_del(&wp->changes_timer);
 
 	if (wp->fd != -1) {
 		bufferevent_free(wp->event);