diff --git a/devstack/override-defaults b/devstack/override-defaults
index ca8a7fb..a84b006 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -2,9 +2,15 @@ ENABLE_NFS_CINDER=$(trueorfalse True ENABLE_NFS_CINDER)
 
 if [[ $ENABLE_NFS_CINDER == "True" ]]; then
     CINDER_DRIVER=nfs
-    CINDER_ENABLED_BACKENDS=nfs:nfs
+    CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-nfs:nfs}
     # NOTE(mriedem): This is a workaround for Cinder bug 1642394.
     CINDER_IMG_CACHE_ENABLED=False
 
+    # Always make sure that once the plugin is enabled, the backend will be
+    # properly activated.
+    if [[ ! $CINDER_ENABLED_BACKENDS == *nfs:nfs* ]]; then
+        CINDER_ENABLED_BACKENDS+=',nfs:nfs'
+    fi
+
     TEMPEST_STORAGE_PROTOCOL=nfs
 fi