diff --git a/beta2beta/beta2beta.services.yml b/beta2beta/beta2beta.services.yml
new file mode 100644
index 0000000..5415275
--- /dev/null
+++ b/beta2beta/beta2beta.services.yml
@@ -0,0 +1,4 @@
+services:
+  entity.definition_update_manager:
+    class: Drupal\beta2beta\Entity\EntityDefinitionUpdateManager
+    arguments: ['@entity.manager', '@state']
diff --git a/beta2beta/src/Entity/EntityDefinitionUpdateManager.php b/beta2beta/src/Entity/EntityDefinitionUpdateManager.php
new file mode 100644
index 0000000..5f317cf
--- /dev/null
+++ b/beta2beta/src/Entity/EntityDefinitionUpdateManager.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\beta2beta\Entity\EntityDefinitionUpdateManager.
+ */
+
+namespace Drupal\beta2beta\Entity;
+
+use Drupal\Core\Entity\EntityDefinitionUpdateManager as CoreEntityDefinitionUpdateManager;
+use Drupal\Core\Entity\EntityManagerInterface;
+use Drupal\Core\State\State;
+
+/**
+ * Wrapper service to the core entity definition update manager.
+ *
+ * This extends the core update definition manager in order to allow selective
+ * disabling of the automatic updates so that other update hooks can attempt to
+ * resolve those.
+ */
+class EntityDefinitionUpdateManager extends CoreEntityDefinitionUpdateManager {
+
+  /**
+   * Site state.
+   *
+   * @var \Drupal\Core\State\State
+   */
+  protected $state;
+
+  /**
+   * Constructs the entity definition update manager.
+   *
+   * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
+   * @param \Drupal\Core\State\State $state
+   */
+  public function __construct(EntityManagerInterface $entity_manager, State $state) {
+    parent::__construct($entity_manager);
+    $this->state = $state;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applyUpdates() {
+    if ($this->state->get('beta2beta.disable_entity_definition_updates', FALSE)) {
+      // Automatic updates are disabled.
+      drupal_set_message($this->t('Automatic entity definition updates are disabled by the Beta 2 Beta module.'), 'warning');
+      return;
+    }
+    parent::applyUpdates();
+  }
+
+}