diff --git a/src/mono/mono/component/debugger-agent.c b/src/mono/mono/component/debugger-agent.c
index 2cfd24d64ebc3..98a51b33f5259 100644
--- a/src/mono/mono/component/debugger-agent.c
+++ b/src/mono/mono/component/debugger-agent.c
@@ -10022,7 +10022,7 @@ cmd_to_string (CommandSet set, int command)
 static gboolean
 wait_for_attach (void)
 {
-	MONO_REQ_GC_SAFE_MODE;
+	MONO_REQ_GC_UNSAFE_MODE;
 
 #ifndef DISABLE_SOCKET_TRANSPORT
 	if (listen_fd == -1) {
@@ -10031,8 +10031,10 @@ wait_for_attach (void)
 	}
 
 	/* Block and wait for client connection */
+	MONO_ENTER_GC_SAFE;
 	conn_fd = socket_transport_accept (listen_fd);
-
+	MONO_EXIT_GC_SAFE;
+	
 	PRINT_DEBUG_MSG (1, "Accepted connection on %d\n", conn_fd);
 	if (conn_fd == -1) {
 		PRINT_DEBUG_MSG (1, "[dbg] Bad client connection\n");