diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index 665a5dbe..be7bca76 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -829,8 +829,12 @@ namespace WebSocketSharp.Server
         }
       }
 
+      var path = uri.AbsolutePath;
+      if (path.IndexOfAny (new[] { '%', '+' }) > -1)
+        path = HttpUtility.UrlDecode (path, Encoding.UTF8);
+
       WebSocketServiceHost host;
-      if (!_services.InternalTryGetServiceHost (uri.AbsolutePath, out host)) {
+      if (!_services.InternalTryGetServiceHost (path, out host)) {
         context.Close (HttpStatusCode.NotImplemented);
         return;
       }