diff --git a/manifests/compute/mdev_type.pp b/manifests/compute/mdev_type.pp
index 065a8cdbf..7ebb2d476 100644
--- a/manifests/compute/mdev_type.pp
+++ b/manifests/compute/mdev_type.pp
@@ -29,18 +29,9 @@ define nova::compute::mdev_type (
   $max_instances    = $facts['os_service_default'],
 ) {
 
-  if empty($device_addresses) {
-    nova_config {
-      "mdev_${mdev_type}/device_addresses": value => $facts['os_service_default']
-    }
-  } else {
-    nova_config {
-      "mdev_${mdev_type}/device_addresses": value => join(any2array($device_addresses), ',');
-    }
-  }
-
   nova_config {
-    "mdev_${mdev_type}/mdev_class":    value => $mdev_class;
-    "mdev_${mdev_type}/max_instances": value => $max_instances;
+    "mdev_${mdev_type}/device_addresses": value => join(any2array($device_addresses), ',');
+    "mdev_${mdev_type}/mdev_class":       value => $mdev_class;
+    "mdev_${mdev_type}/max_instances":    value => $max_instances;
   }
 }
diff --git a/spec/classes/nova_compute_mdev_spec.rb b/spec/classes/nova_compute_mdev_spec.rb
index 850c8b84c..048307e40 100644
--- a/spec/classes/nova_compute_mdev_spec.rb
+++ b/spec/classes/nova_compute_mdev_spec.rb
@@ -33,7 +33,7 @@ describe 'nova::compute::mdev' do
         is_expected.to contain_nova_config('mdev_nvidia-35/device_addresses').with_value('0000:84:00.0,0000:85:00.0')
         is_expected.to contain_nova_config('mdev_nvidia-35/mdev_class').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('mdev_nvidia-35/max_instances').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_nova_config('mdev_nvidia-36/device_addresses').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_nova_config('mdev_nvidia-36/device_addresses').with_value('')
         is_expected.to contain_nova_config('mdev_nvidia-36/mdev_class').with_value('CUSTOM_MDEV1')
         is_expected.to contain_nova_config('mdev_nvidia-36/max_instances').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_nova_config('mdev_nvidia-37/device_addresses').with_value('<SERVICE DEFAULT>')