diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa4c41b2a..b5b736ef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
   unfulfilled requirements when running database updates. (Issue #2919204)
 * Removed a duplicate directory that caused problems when downloading via
   Composer. (GitHub #502)
+* Worked around a bug where some versions of Drush run hooks that are provided
+  by uninstalled modules. (GitHub #496)
 
 ## 2.2.1
 * Lightning Media has been updated to use the new Core Media system.
diff --git a/composer.json b/composer.json
index c4d521929..230f7ebbf 100644
--- a/composer.json
+++ b/composer.json
@@ -146,7 +146,9 @@
                 "2918166 - Media Entity should uninstall itself after migration to core Media is complete":
                 "https://www.drupal.org/files/issues/2918166-7.patch",
                 "2919381 - Don't cache media_entity_type_plugins":
-                "https://www.drupal.org/files/issues/2919381-2.patch"
+                "https://www.drupal.org/files/issues/2919381-2.patch",
+                "2919754 - non-existent service 'plugin.manager.media_entity.type'":
+                "https://www.drupal.org/files/issues/media_entity-drush_updatedb-2919754-6-D8.patch"
             },
             "drupal/media_entity_instagram": {
                 "2917454 - Field formatter test is broken":
diff --git a/composer.lock b/composer.lock
index dc088c037..40087850e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "a1ce1cfae1fbc32c61466aba43b701fa",
+    "content-hash": "91c810d8ab7ad8de59c8981b8eefa112",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2383,7 +2383,8 @@
                     "2880334 - Add update path of media_entity config changes from 1.x to core media module": "https://www.drupal.org/files/issues/media-entity-1.6--c564fc4.diff",
                     "2918172 - Media Entity upgrade -> core fails on absent column revision_uid": "https://www.drupal.org/files/issues/2918172-5.patch",
                     "2918166 - Media Entity should uninstall itself after migration to core Media is complete": "https://www.drupal.org/files/issues/2918166-7.patch",
-                    "2919381 - Don't cache media_entity_type_plugins": "https://www.drupal.org/files/issues/2919381-2.patch"
+                    "2919381 - Don't cache media_entity_type_plugins": "https://www.drupal.org/files/issues/2919381-2.patch",
+                    "2919754 - non-existent service 'plugin.manager.media_entity.type'": "https://www.drupal.org/files/issues/media_entity-drush_updatedb-2919754-6-D8.patch"
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -7346,6 +7347,12 @@
                 "url": "https://git.drupal.org/project/coder.git",
                 "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f"
             },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/klausi/coder/zipball/984c54a7b1e8f27ff1c32348df69712afd86b17f",
+                "reference": "984c54a7b1e8f27ff1c32348df69712afd86b17f",
+                "shasum": ""
+            },
             "require": {
                 "ext-mbstring": "*",
                 "php": ">=5.4.0",
@@ -7918,7 +7925,8 @@
             "homepage": "https://www.drupal.org/project/media_entity_generic",
             "support": {
                 "source": "http://cgit.drupalcode.org/media_entity_generic"
-            }
+            },
+            "time": "2017-10-18T07:13:43+00:00"
         },
         {
             "name": "drush/drush",
diff --git a/drupal-org.make b/drupal-org.make
index 222d022c0..cd8cfc43c 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -46,6 +46,7 @@ projects[media_entity][patch][] = https://www.drupal.org/files/issues/media-enti
 projects[media_entity][patch][] = https://www.drupal.org/files/issues/2918172-5.patch
 projects[media_entity][patch][] = https://www.drupal.org/files/issues/2918166-7.patch
 projects[media_entity][patch][] = https://www.drupal.org/files/issues/2919381-2.patch
+projects[media_entity][patch][] = https://www.drupal.org/files/issues/media_entity-drush_updatedb-2919754-6-D8.patch
 projects[media_entity][version] = 1.6
 projects[media_entity_document][type] = module
 projects[media_entity_document][version] = 1.1