diff --git a/cmd/revad/svcs/grpcsvcs/gatewaysvc/gatewaysvc.go b/cmd/revad/svcs/grpcsvcs/gatewaysvc/gatewaysvc.go
index aed627c2bc..8bc8db437b 100644
--- a/cmd/revad/svcs/grpcsvcs/gatewaysvc/gatewaysvc.go
+++ b/cmd/revad/svcs/grpcsvcs/gatewaysvc/gatewaysvc.go
@@ -54,7 +54,9 @@ func New(m map[string]interface{}, ss *grpc.Server) (io.Closer, error) {
 	}
 
 	storageproviderv0alphapb.RegisterStorageProviderServiceServer(ss, s)
-	authv0alphapb.RegisterAuthServiceServer(ss, s)
+	if c.AuthEndpoint != "" {
+		authv0alphapb.RegisterAuthServiceServer(ss, s)
+	}
 	usershareproviderv0alphapb.RegisterUserShareProviderServiceServer(ss, s)
 	publicshareproviderv0alphapb.RegisterPublicShareProviderServiceServer(ss, s)
 	appregistryv0alphapb.RegisterAppRegistryServiceServer(ss, s)