diff --git a/src/Form/HmOverviewTerms.php b/src/Form/HmOverviewTerms.php
index c861cd4e81a256d553b3b6057cb3258320a5a814..a2296488a87cdef82d80c12ba6070a585528eb76 100644
--- a/src/Form/HmOverviewTerms.php
+++ b/src/Form/HmOverviewTerms.php
@@ -87,7 +87,22 @@ class HmOverviewTerms extends OverviewTerms {
    *   The current state of the form.
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Override the form if the taxonomy hierarchy manager has been set up.
+    if ($config = \Drupal::config('hierarchy_manager.hmconfig')) {
+      if ($allowed_setup_plugins = $config->get('allowed_setup_plugins')) {
+        // If the taxonomy setup plugin is enabled,
+        // override the submitForm function.
+        if (!empty($allowed_setup_plugins['hm_setup_taxonomy'])) {
+          // We don't need to do anything here,
+          // as the taxonomy plugin take it over.
+          return;
+        }
+      }
+    }
 
+    // The taxonomy setup plugin is not enabled.
+    // Let the submitForm function from core handle this request.
+    return parent::submitForm($form, $form_state);
   }
 
 }