diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go
index b14a381b99ab..fde4f83122cf 100644
--- a/internal/rbd/nodeserver.go
+++ b/internal/rbd/nodeserver.go
@@ -226,14 +226,14 @@ func populateRbdVol(
 		}
 	}
 	if krbdSupported {
-		rv.MapOptions = req.GetVolumeContext()["mapOptions"]
-		rv.UnmapOptions = req.GetVolumeContext()["unmapOptions"]
 		rv.Mounter = req.GetVolumeContext()["mounter"]
 	} else {
 		// fallback to rbd-nbd,
 		// ignore the mapOptions and unmapOptions as they are meant for krbd use.
 		rv.Mounter = rbdNbdMounter
 	}
+	rv.MapOptions = req.GetVolumeContext()["mapOptions"]
+	rv.UnmapOptions = req.GetVolumeContext()["unmapOptions"]
 
 	rv.VolID = volID