Merge branch 'staging' into dev/Maddy/feat/welcomeMessages

1 files changed, 1 insertions, 1 deletions

diff --git a/api/src/util/handlers/Instance.ts b/src/api/util/handlers/Instance.ts

index 6bddfa98..e03c9488 100644
--- a/api/src/util/handlers/Instance.ts
+++ b/src/api/util/handlers/Instance.ts
@@ -9,7 +9,7 @@ export async function initInstance() {
 	const { autoJoin } = Config.get().guild;
 
 	if (autoJoin.enabled && !autoJoin.guilds?.length) {
-		let guild = await Guild.findOne({});
+		let guild = await Guild.findOne({ where: {}, order: { id: "ASC" } });
 		if (guild) {
 			// @ts-ignore
 			await Config.set({ guild: { autoJoin: { guilds: [guild.id] } } });