diff --git a/lib/API/Serve.js b/lib/API/Serve.js
index c6a6eb13..6275738c 100644
--- a/lib/API/Serve.js
+++ b/lib/API/Serve.js
@@ -248,7 +248,7 @@ http.createServer(function (request, response) {
 });
 
 function serveFile(uri, request, response) {
-  var file = url.parse(decodeURIComponent(uri || request.url)).pathname;
+  var file = decodeURIComponent(url.parse(uri || request.url).pathname);
 
   if (file === '/' || file === '') {
     file = options.homepage;