diff --git a/http-server/Message/Uri.php b/http-server/Message/Uri.php
index 69134ba9..74bfe499 100644
--- a/http-server/Message/Uri.php
+++ b/http-server/Message/Uri.php
@@ -223,6 +223,9 @@ class Uri implements UriInterface
 		$header = $request->header;
 		$uri = new Uri();
 		$uri = $uri->withScheme(!empty($server['https']) && $server['https'] !== 'off' ? 'https' : 'http');
+		if (isset($request->header['x-forwarded-proto'])) {
+			$uri->withScheme($request->header['x-forwarded-proto']);
+		}
 
 		$hasPort = false;
 		if (isset($server['http_host'])) {