Merge remote-tracking branch 'upstream/staging' into feat/captchaVerify

1 files changed, 2 insertions, 1 deletions

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

index 6bddfa98..7c337270 100644
--- a/api/src/util/handlers/Instance.ts
+++ b/src/api/util/handlers/Instance.ts
@@ -1,4 +1,5 @@
 import { Config, Guild, Session } from "@fosscord/util";
+import { createQueryBuilder } from "typeorm";
 
 export async function initInstance() {
 	// TODO: clean up database and delete tombstone data
@@ -9,7 +10,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] } } });