diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e7b92087aa..7f60d3c01ab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-26  Pedro Alves  <pedro@palves.net>
+
+	* target.c (target_always_non_stop_p): Also check whether the
+	target can async.
+
 2021-03-26  Tom Tromey  <tom@tromey.com>
 
 	* dwarf2/read.c (dwarf2_read_debug_names)
diff --git a/gdb/target.c b/gdb/target.c
index 3653a7a98f8..51832c52b6a 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -4370,10 +4370,11 @@ target_always_non_stop_p (void)
 bool
 target_is_non_stop_p ()
 {
-  return (non_stop
-	  || target_non_stop_enabled == AUTO_BOOLEAN_TRUE
-	  || (target_non_stop_enabled == AUTO_BOOLEAN_AUTO
-	      && target_always_non_stop_p ()));
+  return ((non_stop
+	   || target_non_stop_enabled == AUTO_BOOLEAN_TRUE
+	   || (target_non_stop_enabled == AUTO_BOOLEAN_AUTO
+	       && target_always_non_stop_p ()))
+	  && target_can_async_p ());
 }
 
 /* See target.h.  */