diff --git a/server/oauth2.go b/server/oauth2.go
index 2300e934..4305b0e9 100644
--- a/server/oauth2.go
+++ b/server/oauth2.go
@@ -423,7 +423,8 @@ func (s *Server) parseAuthorizationRequest(r *http.Request) (*storage.AuthReques
 		return nil, newDisplayedErr(http.StatusBadRequest, "Failed to parse request.")
 	}
 	q := r.Form
-	redirectURI, err := url.QueryUnescape(q.Get("redirect_uri"))
+	redirectURI := q.Get("redirect_uri")
+	_, err := url.QueryUnescape(redirectURI)
 	if err != nil {
 		return nil, newDisplayedErr(http.StatusBadRequest, "No redirect_uri provided.")
 	}