diff --git a/go/utils/remotesrv/grpc.go b/go/utils/remotesrv/grpc.go
index 86c06b4f9c..b762c83250 100644
--- a/go/utils/remotesrv/grpc.go
+++ b/go/utils/remotesrv/grpc.go
@@ -301,7 +301,7 @@ func (rs *RemoteChunkStore) GetRepoMetadata(ctx context.Context, req *remotesapi
 
 	return &remotesapi.GetRepoMetadataResponse{
 		NbfVersion:  cs.Version(),
-		NbsVersion:  nbs.StorageVersion,
+		NbsVersion:  req.ClientRepoFormat.NbsVersion,
 		StorageSize: size,
 	}, nil
 }