diff --git a/lib/base/url.cpp b/lib/base/url.cpp
index c456d36de..c491dd35a 100644
--- a/lib/base/url.cpp
+++ b/lib/base/url.cpp
@@ -215,11 +215,11 @@ bool Url::ParsePath(const String& path)
 		if (token.IsEmpty())
 			continue;
 
-		String decodedToken = Utility::UnescapeString(token);
-
-		if (!ValidateToken(decodedToken, ACPATHSEGMENT))
+		if (!ValidateToken(token, ACPATHSEGMENT))
 			return false;
 
+		String decodedToken = Utility::UnescapeString(token);
+
 		m_Path.push_back(decodedToken);
 	}