diff --git a/frankenphp.c b/frankenphp.c
index f6c1c6718..81c66a15a 100644
--- a/frankenphp.c
+++ b/frankenphp.c
@@ -274,6 +274,7 @@ PHP_FUNCTION(frankenphp_handle_request) {
 	}
 
 	frankenphp_worker_request_shutdown();
+	ctx->current_request = 0;
 	go_frankenphp_finish_request(ctx->main_request, request, true);
 
 	RETURN_TRUE;
diff --git a/frankenphp.go b/frankenphp.go
index 9294f07b1..962a55870 100644
--- a/frankenphp.go
+++ b/frankenphp.go
@@ -555,7 +555,6 @@ func go_write_headers(rh C.uintptr_t, status C.int, headers *C.zend_llist) {
 		current = current.next
 	}
 
-	// FIXME: http: superfluous response.WriteHeader call from github.com/dunglas/frankenphp.go_write_headers
 	fc.responseWriter.WriteHeader(int(status))
 
 	if status >= 100 && status < 200 {