diff --git a/src/Plugin/WebformHandler/BrokenWebformHandler.php b/src/Plugin/WebformHandler/BrokenWebformHandler.php
index 2671efc8..ad13812b 100644
--- a/src/Plugin/WebformHandler/BrokenWebformHandler.php
+++ b/src/Plugin/WebformHandler/BrokenWebformHandler.php
@@ -30,12 +30,26 @@ class BrokenWebformHandler extends WebformHandlerBase {
    * {@inheritdoc}
    */
   public function getSummary() {
-    $t_args = ['%label' => $this->getLabel(), '@id' => $this->getHandlerId()];
+    $t_args = ['%plugin_id' => $this->getPluginId()];
     return [
       'message' => [
-        '#markup' => $this->t('This handler is broken or missing. You might need to enable the original module.', $t_args),
+        '#markup' => $this->t('This %plugin_id handler is broken or missing. You might need to enable the original module and/or clear the cache.', $t_args),
       ],
     ];
   }
 
+  /**
+   * Set a broken handler's plugin id.
+   *
+   * This allows broken handlers to preserve the original handler's plugin ID.
+   *
+   * @param string $plugin_id
+   *   The original handler's plugin ID.
+   *
+   * @see \Drupal\webform\Plugin\WebformHandlerPluginCollection::initializePlugin
+   */
+  public function setPluginId($plugin_id) {
+    $this->pluginId = $plugin_id;
+  }
+
 }
diff --git a/src/Plugin/WebformHandlerPluginCollection.php b/src/Plugin/WebformHandlerPluginCollection.php
index 66585445..125204f0 100644
--- a/src/Plugin/WebformHandlerPluginCollection.php
+++ b/src/Plugin/WebformHandlerPluginCollection.php
@@ -3,6 +3,7 @@
 namespace Drupal\webform\Plugin;
 
 use Drupal\Core\Plugin\DefaultLazyPluginCollection;
+use Drupal\webform\Plugin\WebformHandler\BrokenWebformHandler;
 
 /**
  * A collection of webform handlers.
@@ -22,4 +23,20 @@ class WebformHandlerPluginCollection extends DefaultLazyPluginCollection {
     return ($a_weight < $b_weight) ? -1 : 1;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializePlugin($instance_id) {
+    parent::initializePlugin($instance_id);
+
+    // If the initialized handler is broken preserve the original
+    // handler's plugin ID.
+    // @see \Drupal\webform\Plugin\WebformHandler\BrokenWebformHandler::setPluginId
+    $plugin = $this->get($instance_id);
+    if ($plugin instanceof BrokenWebformHandler) {
+      $original_id = $this->configurations[$instance_id]['id'];
+      $plugin->setPluginId($original_id);
+    }
+  }
+
 }