diff --git a/src/channel.c b/src/channel.c
index 84dfcf7c0b..f4dc323b6f 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2868,6 +2868,11 @@ channel_close_on_error(channel_T *channel, char *func)
      * died.  Don't close the channel right away, it may be the wrong moment
      * to invoke callbacks. */
     channel->ch_to_be_closed = TRUE;
+
+#ifdef FEAT_GUI
+    /* Stop listening to GUI events right away. */
+    channel_gui_unregister(channel);
+#endif
 }
 
     static void
diff --git a/src/version.c b/src/version.c
index 2a259a528e..80793f10bb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1850,
 /**/
     1849,
 /**/