diff --git a/lib/createInlinePluginCreator.js b/lib/createInlinePluginCreator.js
index e9ddd8b..0cbea2d 100644
--- a/lib/createInlinePluginCreator.js
+++ b/lib/createInlinePluginCreator.js
@@ -1,8 +1,9 @@
 const { writeFileSync } = require("fs");
+const { identity } = require("lodash");
+const EventEmitter = require("promise-events");
 const getCommitsFiltered = require("./getCommitsFiltered");
 const getManifest = require("./getManifest");
 const hasChangedDeep = require("./hasChangedDeep");
-const EventEmitter = require("promise-events");
 
 /**
  * Create an inline plugin creator for a multirelease.
@@ -28,10 +29,14 @@ function createInlinePluginCreator(packages, multiContext) {
 	todo().forEach((p) => (p._readyForRelease = ee.once(p.name)));
 
 	// Status sync point.
-	const waitFor = (prop) => {
+	const waitFor = (prop, filter = identity) => {
 		const promise = ee.once(prop);
 
-		if (todo().every((p) => p.hasOwnProperty(prop))) {
+		if (
+			todo()
+				.filter(filter)
+				.every((p) => p.hasOwnProperty(prop))
+		) {
 			ee.emit(prop);
 		}
 
@@ -160,7 +165,7 @@ function createInlinePluginCreator(packages, multiContext) {
 			// Wait until all todo packages are ready to generate notes.
 			await waitFor("_nextRelease");
 
-			if (packages[0] !== pkg) {
+			if (todo()[0] !== pkg) {
 				await pkg._readyForRelease;
 			}
 
@@ -195,14 +200,14 @@ function createInlinePluginCreator(packages, multiContext) {
 
 		const publish = async () => {
 			pkg._prepared = true;
-			const nextPkgToProcess = todo().find((p) => !p._prepared);
+			const nextPkgToProcess = todo().find((p) => p._nextType && !p._prepared);
 
 			if (nextPkgToProcess) {
 				ee.emit(nextPkgToProcess.name);
 			}
 
 			// Wait for all packages to be `prepare`d and tagged by `semantic-release`
-			await waitFor("_prepared");
+			await waitFor("_prepared", (p) => p._nextType);
 
 			return {};
 		};
diff --git a/yarn.lock b/yarn.lock
index d8e6cc1..dbbcc31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2172,7 +2172,7 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -3445,7 +3445,7 @@ import-local@^3.0.2:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -4655,11 +4655,6 @@ lockfile@^1.0.4:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -4668,33 +4663,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -4735,11 +4708,6 @@ lodash.isstring@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"