diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 50e87fb6538..b93a1dda8dd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-07  Simon Marchi  <simon.marchi@efficios.com>
+
+	* target.c (target_close): Check in all inferiors that the
+	target is not pushed.
+
 2021-05-07  Aaron Merey  <amerey@redhat.com>
 
 	* debuginfod-support.c (debuginfod_init): Remove.
diff --git a/gdb/target.c b/gdb/target.c
index 1f0741471d8..00f0acde758 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -3734,7 +3734,8 @@ debug_target::info () const
 void
 target_close (struct target_ops *targ)
 {
-  gdb_assert (!current_inferior ()->target_is_pushed (targ));
+  for (inferior *inf : all_inferiors ())
+    gdb_assert (!inf->target_is_pushed (targ));
 
   fileio_handles_invalidate_target (targ);