diff --git a/docs/networking/port-management.md b/docs/networking/port-management.md
index 27431dd73..7e4629905 100644
--- a/docs/networking/port-management.md
+++ b/docs/networking/port-management.md
@@ -126,7 +126,7 @@ For buildpack deployments, your application *must* respect the `PORT` environmen
 
 > Changed as of 0.5.0
 
-Dokku's default proxy implementation - nginx - only supports HTTP request proxying. At this time, we do not support proxying plain TCP or UDP ports. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`. If you would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/docs/advanced-usage/proxy-management.md).
+Dokku's default proxy implementation - nginx - supports HTTP and GRPC request proxying. At this time, we do not support proxying plain TCP or UDP ports. UDP ports can be exposed by disabling the nginx proxy with `dokku proxy:disable myapp`. If you would like to investigate alternative proxy methods, please refer to our [proxy management documentation](/docs/advanced-usage/proxy-management.md).
 
 #### Applications using EXPOSE
 
diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions
index c04530ace..03ab8637c 100755
--- a/plugins/nginx-vhosts/functions
+++ b/plugins/nginx-vhosts/functions
@@ -281,7 +281,6 @@ is_grpc_enabled() {
   echo $HAS_SUPPORT
 }
 
-
 nginx_build_config() {
   declare desc="build nginx config to proxy app containers using sigil"
   local APP="$1"
diff --git a/tests/unit/40_nginx-vhosts_3.bats b/tests/unit/40_nginx-vhosts_3.bats
index 6336da6ea..65e184986 100644
--- a/tests/unit/40_nginx-vhosts_3.bats
+++ b/tests/unit/40_nginx-vhosts_3.bats
@@ -25,6 +25,13 @@ teardown() {
   assert_output "Greeting: Hello grpc"
 }
 
+@test "(nginx-vhosts) grpc endpoint on a port other than 80" {
+  deploy_app gogrpc
+  dokku proxy:ports-add "$TEST_APP" "grpc:8080:50051"
+  run /bin/bash -c "docker run --rm ${TEST_APP}-docker-image /go/bin/greeter_client -address ${TEST_APP}.dokku.me:8080 -name grpc8080"
+  assert_output "Greeting: Hello grpc8080"
+}
+
 @test "(nginx-vhosts) grpcs endpoint" {
   setup_test_tls
   deploy_app gogrpc