diff --git a/pywb/rewrite/test/test_wburl.py b/pywb/rewrite/test/test_wburl.py
index d012d9ee..dea03a47 100644
--- a/pywb/rewrite/test/test_wburl.py
+++ b/pywb/rewrite/test/test_wburl.py
@@ -76,6 +76,12 @@ http://xn--e1afmkfd.xn--80akhbyknj4f
 >>> print(WbUrl.to_uri('https://xn--e1afmkfd.xn--80akhbyknj4f/foo/bar?abc=def'))
 https://xn--e1afmkfd.xn--80akhbyknj4f/foo/bar?abc=def
 
+>>> print(WbUrl.to_uri('somescheme://test?foo=bar%9F'))
+somescheme://test?foo=bar%9F
+
+>>> print(WbUrl.to_uri('/test/foo=bar%9F'))
+/test/foo=bar%9F
+
 # truncated
 >>> print(WbUrl.to_uri('http://' + quote_plus(u'пример.испытание'.encode('utf-8'))[1:]))
 http://xn--d0-olcluwd.xn--80akhbyknj4f
diff --git a/pywb/rewrite/wburl.py b/pywb/rewrite/wburl.py
index d2711956..b7d90449 100644
--- a/pywb/rewrite/wburl.py
+++ b/pywb/rewrite/wburl.py
@@ -91,7 +91,7 @@ class WbUrl(BaseWbUrl):
 
     DEFAULT_SCHEME = 'http://'
 
-    FIRST_PATH = re.compile('(?<![:/])/(?![/])')
+    FIRST_PATH = re.compile('(?<![:/])[/?](?![/])')
 
 
     @staticmethod