diff --git a/hub/route/proxies.go b/hub/route/proxies.go
index 36c9d1b14..c1e30b219 100644
--- a/hub/route/proxies.go
+++ b/hub/route/proxies.go
@@ -46,7 +46,7 @@ func parseProxyName(next http.Handler) http.Handler {
 func findProxyByName(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		name := r.Context().Value(CtxKeyProxyName).(string)
-		proxies := tunnel.Proxies()
+		proxies := tunnel.ProxiesWithProviders()
 		proxy, exist := proxies[name]
 		if !exist {
 			render.Status(r, http.StatusNotFound)
@@ -60,7 +60,7 @@ func findProxyByName(next http.Handler) http.Handler {
 }
 
 func getProxies(w http.ResponseWriter, r *http.Request) {
-	proxies := tunnel.Proxies()
+	proxies := tunnel.ProxiesWithProviders()
 	render.JSON(w, r, render.M{
 		"proxies": proxies,
 	})
diff --git a/tunnel/tunnel.go b/tunnel/tunnel.go
index b7557e10b..fd601d30e 100644
--- a/tunnel/tunnel.go
+++ b/tunnel/tunnel.go
@@ -127,6 +127,20 @@ func Proxies() map[string]C.Proxy {
 	return proxies
 }
 
+func ProxiesWithProviders() map[string]C.Proxy {
+	allProxies := make(map[string]C.Proxy)
+	for name, proxy := range proxies {
+		allProxies[name] = proxy
+	}
+	for _, p := range providers {
+		for _, proxy := range p.Proxies() {
+			name := proxy.Name()
+			allProxies[name] = proxy
+		}
+	}
+	return allProxies
+}
+
 // Providers return all compatible providers
 func Providers() map[string]provider.ProxyProvider {
 	return providers