diff --git a/rpc_deployment/roles/cinder_device_add/tasks/device_add.yml b/rpc_deployment/roles/cinder_device_add/tasks/device_add.yml
index ca919f64bd..e0ee5ba2c9 100644
--- a/rpc_deployment/roles/cinder_device_add/tasks/device_add.yml
+++ b/rpc_deployment/roles/cinder_device_add/tasks/device_add.yml
@@ -28,5 +28,5 @@
       done
     fi
   with_items: cinder_backends|dictsort
-  when: cinder_backends is defined and is_metal != true
+  when: cinder_backends is defined and is_metal != true and cinder_backends[item.0]['volume_group'] is defined
   delegate_to: "{{ physical_host }}"