diff --git a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_response_stream.e b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_response_stream.e
index 40a65e5e..991971a1 100644
--- a/library/server/ewsgi/connectors/standalone/src/wgi_standalone_response_stream.e
+++ b/library/server/ewsgi/connectors/standalone/src/wgi_standalone_response_stream.e
@@ -110,7 +110,9 @@ feature -- Header output operation
 					if
 						not l_connection.is_case_insensitive_equal_general ("close")
 					then
-						s.replace_substring ("Connection: close", i + 1, j - 1)
+						if not l_connection.is_case_insensitive_equal_general ("upgrade") then
+							s.replace_substring ("Connection: close", i + 1, j - 1)
+						end
 					end
 				elseif not is_http_version_1_0 then
 						-- HTTP/1.1: always return "close" since persistent connection is not supported.