diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 4e6e940a..1052226e 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -954,6 +954,7 @@ void fe_events_numeric_init(void)
 	signal_add("event 436", (SIGNAL_FUNC) event_received);
 	signal_add("event 438", (SIGNAL_FUNC) event_received);
 	signal_add("event 465", (SIGNAL_FUNC) event_received);
+	signal_add("event 439", (SIGNAL_FUNC) event_received);
 	signal_add("event 482", (SIGNAL_FUNC) event_received);
 
 	signal_add("event 368", (SIGNAL_FUNC) event_target_received);
@@ -1038,6 +1039,7 @@ void fe_events_numeric_deinit(void)
 	signal_remove("event 436", (SIGNAL_FUNC) event_received);
 	signal_remove("event 438", (SIGNAL_FUNC) event_received);
 	signal_remove("event 465", (SIGNAL_FUNC) event_received);
+	signal_remove("event 439", (SIGNAL_FUNC) event_received);
 	signal_remove("event 482", (SIGNAL_FUNC) event_received);
 
 	signal_remove("event 368", (SIGNAL_FUNC) event_target_received);
diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c
index 3856f9bd..526c17d9 100644
--- a/src/irc/core/channel-events.c
+++ b/src/irc/core/channel-events.c
@@ -365,6 +365,7 @@ void channel_events_init(void)
 	signal_add_first("event 475", (SIGNAL_FUNC) event_cannot_join); /* bad channel key */
 	signal_add_first("event 476", (SIGNAL_FUNC) event_cannot_join); /* bad channel mask */
 	signal_add_first("event 379", (SIGNAL_FUNC) event_cannot_join); /* forwarding to another channel */
+	signal_add_first("event 439", (SIGNAL_FUNC) event_cannot_join); /* target change too fast */
 
 	signal_add("event topic", (SIGNAL_FUNC) event_topic);
 	signal_add_first("event join", (SIGNAL_FUNC) event_join);
@@ -389,6 +390,7 @@ void channel_events_deinit(void)
 	signal_remove("event 475", (SIGNAL_FUNC) event_cannot_join); /* bad channel key */
 	signal_remove("event 476", (SIGNAL_FUNC) event_cannot_join); /* bad channel mask */
 	signal_remove("event 379", (SIGNAL_FUNC) event_cannot_join); /* forwarding to another channel */
+	signal_remove("event 439", (SIGNAL_FUNC) event_cannot_join); /* target change too fast */
 
 	signal_remove("event topic", (SIGNAL_FUNC) event_topic);
 	signal_remove("event join", (SIGNAL_FUNC) event_join);