diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts
index bc1d7cb..651e8e6 100644
--- a/bundle/src/Server.ts
+++ b/bundle/src/Server.ts
@@ -33,7 +33,6 @@
 //this is what has been added for the /stop API route
 
 async function main() {
-	server.listen(port);
 	await initDatabase();
 	await Config.init();
 	// only set endpointPublic, if not already set
@@ -84,7 +83,7 @@
 		app.use(Sentry.Handlers.requestHandler());
 		app.use(Sentry.Handlers.tracingHandler());
 	}
-	await Promise.all([api.start(), cdn.start(), gateway.start()]);
+
 	if (Config.get().sentry.enabled) {
 		app.use(Sentry.Handlers.errorHandler());
 		app.use(function onError(err: any, req: any, res: any, next: any) {
@@ -92,6 +91,8 @@
 			res.end(res.sentry + "\n");
 		});
 	}
+
+	await Promise.all([api.start(), cdn.start(), gateway.start()]);
 	console.log(`[Server] ${green(`listening on port ${bold(port)}`)}`);
 }