diff --git a/modules/webform_node/config/install/field.storage.node.webform.yml b/modules/webform_node/config/install/field.storage.node.webform.yml
index ee9415d..3323bdb 100644
--- a/modules/webform_node/config/install/field.storage.node.webform.yml
+++ b/modules/webform_node/config/install/field.storage.node.webform.yml
@@ -4,6 +4,9 @@ dependencies:
   module:
     - node
     - webform
+  enforced:
+    module:
+      - webform
 id: node.webform
 field_name: webform
 entity_type: node
diff --git a/modules/webform_node/webform_node.install b/modules/webform_node/webform_node.install
index 27bb646..5250180 100644
--- a/modules/webform_node/webform_node.install
+++ b/modules/webform_node/webform_node.install
@@ -5,8 +5,6 @@
  * Install, update and uninstall functions for the webform node module.
  */
 
-use Drupal\node\Entity\NodeType;
-
 /**
  * Implements hook_requirements().
  */
@@ -16,16 +14,8 @@ function webform_node_requirements($phase) {
   // happen during a D7 to D8 content migration.
   // @see https://www.drupal.org/node/2856599
   if ($phase == 'install') {
-    // We have to put the check in a try catch.. otherwise it raise a
-    // NoCorrespondingEntityClassException if this module is a
-    // dependency in a installation profile.
-    try {
-      $node_type = NodeType::load('webform');
-    }
-    catch (Exception $e) {
-      // Do nothing.
-    }
-    if ($node_type) {
+    $manager = \Drupal::entityTypeManager();
+    if ($manager->hasDefinition('node_type') && ($node_type = $manager->getStorage('node_type')->load('webform'))) {
       $requirements['webform_node'] = [
         'title' => t('Webform Node'),
         'description' => t('%title content type already exists, please delete the %title content type before installing the Webform node module.', ['%title' => $node_type->label()]),
@@ -36,20 +26,3 @@ function webform_node_requirements($phase) {
   }
   return $requirements;
 }
-
-/**
- * Implements hook_uninstall().
- */
-function webform_node_uninstall() {
-  // Delete the webform node type.
-  if ($node_type = NodeType::load('webform')) {
-    $node_type->delete();
-  }
-
-  // Delete field storage if it is no longer being used by any bundles.
-  if ($field_storage = \Drupal::entityTypeManager()->getStorage('field_storage_config')->load('node.webform')) {
-    if (!$field_storage->getBundles()) {
-      $field_storage->delete();
-    }
-  }
-}