diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 205dd4d388..55afb54ec6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-22  Pedro Alves  <palves@redhat.com>
+
+	* remote.c (remote_target::mourn_inferior): Move
+	discard_pending_stop_replies call here from ...
+	(_initialize_remote): ... here.
+
 2018-05-22  Pedro Alves  <palves@redhat.com>
 
 	* remote.c (compare_section_command): Remove set_general_process
diff --git a/gdb/remote.c b/gdb/remote.c
index fbf23b8a43..59880a93a8 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -9671,6 +9671,10 @@ remote_target::mourn_inferior ()
 {
   struct remote_state *rs = get_remote_state ();
 
+  /* We're no longer interested in notification events of an inferior
+     that exited or was killed/detached.  */
+  discard_pending_stop_replies (current_inferior ());
+
   /* In 'target remote' mode with one inferior, we close the connection.  */
   if (!rs->extended && number_of_live_inferiors () <= 1)
     {
@@ -14073,9 +14077,6 @@ _initialize_remote (void)
 
   /* Hook into new objfile notification.  */
   gdb::observers::new_objfile.attach (remote_new_objfile);
-  /* We're no longer interested in notification events of an inferior
-     when it exits.  */
-  gdb::observers::inferior_exit.attach (discard_pending_stop_replies);
 
 #if 0
   init_remote_threadtests ();