diff --git a/HttpServer/Events/OnHandshake.php b/HttpServer/Events/OnHandshake.php
index a0f61e0e..4ac4e740 100644
--- a/HttpServer/Events/OnHandshake.php
+++ b/HttpServer/Events/OnHandshake.php
@@ -108,12 +108,13 @@ class OnHandshake extends Callback
 			}
 			$router = Snowflake::app()->getRouter();
 
-//			$context = Config::get('router', false, ROUTER_TREE);
-//			if ($context === ROUTER_TREE) {
+			$context = Config::get('router', false, ROUTER_TREE);
+			var_dump($context);
+			if ($context === ROUTER_TREE) {
 				$node = $router->tree_search(explode('/', Socket::HANDSHAKE . '::event'), 'sw::socket');
-//			} else {
-//				$node = $router->search('/' . Socket::HANDSHAKE . '::event', 'sw::socket');
-//			}
+			} else {
+				$node = $router->search('/' . Socket::HANDSHAKE . '::event', 'sw::socket');
+			}
 			if ($node === null) {
 				return $this->disconnect($response, 502);
 			}