diff --git a/src/handler/proxyhandler.go b/src/handler/proxyhandler.go
index 896dd430fe33440092ce3479bb89ed99c0db6802..f49c2f1625f80d013e737e9481fb5695ab714475 100644
--- a/src/handler/proxyhandler.go
+++ b/src/handler/proxyhandler.go
@@ -42,6 +42,8 @@ func getProxyURL(req *http.Request) string {
 		result = fmt.Sprintf("http://%s%s", config.ProxyHost, path)
 	} else {
 		result = fmt.Sprintf("http://%s%s?%s", config.ProxyHost, path, rawQuery)
+	}
+	if strings.Contains(result, "?") {
 		if strings.HasSuffix(result, "/") {
 			result = strings.TrimRight(result, "/")
 		}