diff --git a/internal/startrpc/start.go b/internal/startrpc/start.go
index 17afcc7a9..18fe7cef4 100644
--- a/internal/startrpc/start.go
+++ b/internal/startrpc/start.go
@@ -59,16 +59,11 @@ func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(c
 			}
 		}
 	}()
-
-	err = rpcFn(zkClient, srv)
-	if err != nil {
-		return utils.Wrap1(err)
-	}
 	err = srv.Serve(listener)
 	if err != nil {
 		return utils.Wrap1(err)
 	}
-	return nil
+	return rpcFn(zkClient, srv)
 }
 
 //func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error {