diff --git a/HttpServer/Http/Request.php b/HttpServer/Http/Request.php
index 184a4660..4dbd43ea 100644
--- a/HttpServer/Http/Request.php
+++ b/HttpServer/Http/Request.php
@@ -418,7 +418,7 @@ class Request extends Application
 	 */
 	public static function create($request)
 	{
-		$sRequest = new Request();
+		$sRequest = Context::setContext('request', new Request());
 		$sRequest->fd = $request->fd;
 		$sRequest->startTime = microtime(true);
 		$sRequest->uri = $request->server['request_uri'] ?? $request->header['request_uri'];
@@ -431,7 +431,6 @@ class Request extends Application
 			$headers = array_merge($headers, $request->header);
 		}
 		$sRequest->headers = new HttpHeaders($headers);
-		unset($request);
 		return $sRequest;
 	}
 
diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php
index 185eb4b3..0047b4c8 100644
--- a/HttpServer/Http/Response.php
+++ b/HttpServer/Http/Response.php
@@ -198,11 +198,10 @@ class Response extends Application
 	/**
 	 * @param null $response
 	 * @return mixed
-	 * @throws ComponentException
 	 */
 	public static function create($response = null)
 	{
-		$ciResponse = Snowflake::app()->clone('response');
+		$ciResponse = Context::setContext('response',new Response());
 		$ciResponse->response = $response;
 		$ciResponse->startTime = microtime(true);
 		$ciResponse->format = self::JSON;