diff --git a/src/Klein/Request.php b/src/Klein/Request.php
index 9ee35602..a207ce87 100644
--- a/src/Klein/Request.php
+++ b/src/Klein/Request.php
@@ -433,7 +433,12 @@ public function userAgent()
      */
     public function uri()
     {
-        return $this->server->get('REQUEST_URI', '/');
+        $uri = $this->server->get('PATH_INFO');
+        if (!empty($uri))
+        {
+            $uri = $this->server->get('REQUEST_URI', '/');
+        }
+        return $uri;
     }
 
     /**