diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index d47ad78146..8d7bfa80e3 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -361,7 +361,9 @@ conditions:
 
   enable_live_migration_tunnelled:
     or:
-      - equals: [{get_param: NovaNfsEnabled}, true]
+      - and:
+        - equals: [{get_param: NovaNfsEnabled}, true]
+        - equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, '']
       - equals: [{get_param: [RoleParameters, NovaNfsEnabled]}, true]
       - equals: [{get_param: NovaEnableRbdBackend}, true]