diff --git a/plans/convert.pp b/plans/convert.pp
index 4d484f41..1ff1771a 100644
--- a/plans/convert.pp
+++ b/plans/convert.pp
@@ -305,8 +305,14 @@
     # Restart cluster compiler services that are likely not restarted by our
     # final Puppet run to increase chance everything is functional upon plan
     # completion
-    run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service',
-    $all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target)
+    if $legacy_compiler_targets {
+      run_command('systemctl restart pe-puppetserver.service', $legacy_compiler_targets)
+    }
+
+    # PuppetDB is only found on modern compilers, not legacy ones
+    if $compiler_targets {
+      run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service', $compiler_targets)
+    }
 
     # Run puppet on all targets again to ensure everything is fully up-to-date
     run_task('peadm::puppet_runonce', $all_targets)
diff --git a/types/convertsteps.pp b/types/convertsteps.pp
index 7ab55a70..93cb099b 100644
--- a/types/convertsteps.pp
+++ b/types/convertsteps.pp
@@ -1,4 +1,4 @@
 #
 # @summary type for the different steps where the peadm::convert plan can be started
 #
-type Peadm::ConvertSteps = Enum[ 'modify-primary-certs', 'modify-infra-certs', 'convert-node-groups', 'finalize']
+type Peadm::ConvertSteps = Enum['modify-primary-certs', 'modify-infra-certs', 'convert-node-groups', 'finalize']