diff --git a/server/startup/migrations/v185.js b/server/startup/migrations/v185.js
index c6a20c9aa3984..34eec12394887 100644
--- a/server/startup/migrations/v185.js
+++ b/server/startup/migrations/v185.js
@@ -9,7 +9,7 @@ Migrations.add({
 	version: 185,
 	up() {
 		const setting = Settings.findOne({ _id: 'Message_SetNameToAliasEnabled' });
-		if (setting.value) {
+		if (setting && setting.value) {
 			Settings.update({ _id: 'UI_Use_Real_Name' }, {
 				$set: {
 					value: true,
diff --git a/server/startup/migrations/v187.js b/server/startup/migrations/v187.js
index 6b430b8f7629e..e650327ae2e89 100644
--- a/server/startup/migrations/v187.js
+++ b/server/startup/migrations/v187.js
@@ -61,6 +61,13 @@ Migrations.add({
 		Settings.remove({ _id: 'Push_debug' });
 		Settings.remove({ _id: 'Notifications_Always_Notify_Mobile' });
 
-		Promise.await(migrateNotifications());
+		try {
+			Promise.await(migrateNotifications());
+		} catch (err) {
+			// Ignore if the collection does not exist
+			if (!err.code || err.code !== 26) {
+				throw err;
+			}
+		}
 	},
 });