diff --git a/internal/csi-common/server.go b/internal/csi-common/server.go
index 13157f222fa..727ef57f80f 100644
--- a/internal/csi-common/server.go
+++ b/internal/csi-common/server.go
@@ -45,6 +45,7 @@ type Servers struct {
 	IS csi.IdentityServer
 	CS csi.ControllerServer
 	NS csi.NodeServer
+	GS csi.GroupControllerServer
 }
 
 // NewNonBlockingGRPCServer return non-blocking GRPC.
@@ -109,6 +110,9 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, srv Servers) {
 	if srv.NS != nil {
 		csi.RegisterNodeServer(server, srv.NS)
 	}
+	if srv.GS != nil {
+		csi.RegisterGroupControllerServer(server, srv.GS)
+	}
 
 	log.DefaultLog("Listening for connections on address: %#v", listener.Addr())
 	err = server.Serve(listener)