diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index 6425bf65f6..f0eb039d8e 100644
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@@ -189,7 +189,9 @@ parameters:
 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]