diff --git a/cephfs/main.go b/cephfs/main.go
index 7d53f551529..e77089832d2 100644
--- a/cephfs/main.go
+++ b/cephfs/main.go
@@ -35,7 +35,7 @@ var (
 	driverName      = flag.String("drivername", "csi-cephfsplugin", "name of the driver")
 	nodeId          = flag.String("nodeid", "", "node id")
 	volumeMounter   = flag.String("volumemounter", "", "default volume mounter (possible options are 'kernel', 'fuse')")
-	metadataStorage = flag.String("metadatastorage", "", "metadata persistence method [node|k8s_configmap]")
+	metadataStorage = flag.String("metadatastorage", "node", "metadata persistence method [node|k8s_configmap]")
 )
 
 func main() {
diff --git a/rbd/main.go b/rbd/main.go
index 71b4c741677..b85e93b635d 100644
--- a/rbd/main.go
+++ b/rbd/main.go
@@ -50,10 +50,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	if *metadataStorage != "node" && *metadataStorage != "k8s_configmap" {
-		glog.Errorf("invalid cache persistent option: %s", *metadataStorage)
-		os.Exit(1)
-	}
 	cp, err := util.NewCachePersister(*metadataStorage, *driverName)
 	if err != nil {
 		glog.Errorf("failed to define cache persistence method: %v", err)