diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
index 86c6baaf1..e3775d9ab 100644
--- a/pkg/driver/controller.go
+++ b/pkg/driver/controller.go
@@ -95,7 +95,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 			return nil, status.Error(codes.InvalidArgument, "Invalid value for reuseAccessPoint parameter")
 		}
 		if reuseAccessPoint {
-			clientToken = get64LenHash(volumeParams[PvcNameKey])
+			clientToken = get64LenHash(volumeParams[PvcNameKey] + volumeParams[FsId])
 			klog.V(5).Infof("Client token : %s", clientToken)
 		}
 	}