diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 920df3ec312..256b9d08061 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-03  Pedro Alves  <pedro@palves.net>
+
+	* infrun.c (prepare_for_detach): Don't release scoped_restore
+	before returning.
+
 2021-02-03  Pedro Alves  <pedro@palves.net>
 
 	* infrun.c (handle_one): New function, factored out from ...
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 51d60f49629..895f47457fd 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3607,13 +3607,8 @@ prepare_for_detach (void)
 	 at this point, and signals are passed directly to the
 	 inferior, so this must mean the process is gone.  */
       if (!ecs->wait_some_more)
-	{
-	  restore_detaching.release ();
-	  error (_("Program exited while detaching"));
-	}
+	error (_("Program exited while detaching"));
     }
-
-  restore_detaching.release ();
 }
 
 /* Wait for control to return from inferior to debugger.