diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 11e9ea9c97..0451a07811 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-19  Pedro Alves  <pedro@palves.net>
+
+	* thread.c (any_thread_of_inferior): Check if there's a selected
+	thread before calling inferior_thread().
+
 2021-03-18  Tom Tromey  <tromey@adacore.com>
 
 	* dwarf2/stringify.c (dwarf_unit_type_name): New function.  Use
diff --git a/gdb/thread.c b/gdb/thread.c
index 3e7d6e14bf..fc6db96fbc 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -637,8 +637,8 @@ any_thread_of_inferior (inferior *inf)
 {
   gdb_assert (inf->pid != 0);
 
-  /* Prefer the current thread.  */
-  if (inf == current_inferior ())
+  /* Prefer the current thread, if there's one.  */
+  if (inf == current_inferior () && inferior_ptid != null_ptid)
     return inferior_thread ();
 
   for (thread_info *tp : inf->non_exited_threads ())