diff --git a/public/openapi/read.yaml b/public/openapi/read.yaml
index be27b5a30095..6c2653fc7e31 100644
--- a/public/openapi/read.yaml
+++ b/public/openapi/read.yaml
@@ -2204,10 +2204,8 @@ paths:
                                   type: boolean
                                 runJobs:
                                   type: boolean
-                                  nullable: true
                                 jobsDisabled:
                                   type: boolean
-                                  nullable: true
                             git:
                               type: object
                               properties:
diff --git a/src/messaging/rooms.js b/src/messaging/rooms.js
index 5dbd834f0379..0f99028cfebe 100644
--- a/src/messaging/rooms.js
+++ b/src/messaging/rooms.js
@@ -50,10 +50,11 @@ module.exports = function (Messaging) {
 			db.sortedSetAdd('chat:room:' + roomId + ':uids', now, uid),
 		]);
 		await Promise.all([
-			Messaging.addSystemMessage('user-join', uid, roomId),	// chat owner should also get the user-join system message
 			Messaging.addUsersToRoom(uid, toUids, roomId),
 			Messaging.addRoomToUsers(roomId, [uid].concat(toUids), now),
 		]);
+		// chat owner should also get the user-join system message
+		await Messaging.addSystemMessage('user-join', uid, roomId);
 
 		return roomId;
 	};
diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index ee288ee122cc..da0a600bf790 100644
--- a/test/mocks/databasemock.js
+++ b/test/mocks/databasemock.js
@@ -138,7 +138,7 @@ before(async function () {
 	nconf.set('socket.io:origins', '*:*');
 	nconf.set('version', packageInfo.version);
 	nconf.set('runJobs', false);
-	nconf.set('disableJobs', true);
+	nconf.set('jobsDisabled', true);
 
 	await meta.dependencies.check();