diff --git a/package-lock.json b/package-lock.json
index 44edadbb..fc8bff16 100644
Binary files a/package-lock.json and b/package-lock.json differ
diff --git a/package.json b/package.json
index 15aa8b04..eb2ac2e9 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
 	},
 	"homepage": "https://github.com/fosscord/fosscord-api#readme",
 	"dependencies": {
-		"@fosscord/server-util": "^1.3.37",
+		"@fosscord/server-util": "^1.3.38",
 		"@types/jest": "^26.0.22",
 		"@types/json-schema": "^7.0.7",
 		"ajv": "^8.4.0",
diff --git a/src/Server.ts b/src/Server.ts
index aa66b5b6..49bb2398 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -165,7 +165,10 @@ export class FosscordServer extends Server {
 						/CDN_HOST: ".+"/,
 						`CDN_HOST: "${(Config.get().cdn.endpoint || "http://localhost:3003").replace(/https?:/, "")}"`
 					)
-					.replace(/GATEWAY_ENDPOINT: ".+"/, `GATEWAY_ENDPOINT: "${Config.get().gateway.endpoint || "ws://localhost:3002"}"`)
+					.replace(
+						/GATEWAY_ENDPOINT: ".+"/,
+						`GATEWAY_ENDPOINT: "${Config.get().gateway.endpoint || process.env.GATEWAY || "ws://localhost:3002"}"`
+					)
 			);
 		});
 		return super.start();
diff --git a/src/middlewares/RateLimit.ts b/src/middlewares/RateLimit.ts
index 89e002df..088c3161 100644
--- a/src/middlewares/RateLimit.ts
+++ b/src/middlewares/RateLimit.ts
@@ -1,5 +1,5 @@
 import { db, MongooseCache, Bucket } from "@fosscord/server-util";
-import { NextFunction, Request, Response } from "express";
+import { IRouterHandler, NextFunction, Request, Response } from "express";
 import { getIpAdress } from "../util/ipAddress";
 import { API_PREFIX_TRAILING_SLASH } from "./Authentication";
 
@@ -43,10 +43,10 @@ export default function RateLimit(opts: {
 	error?: boolean;
 	success?: boolean;
 	onylIp?: boolean;
-}) {
+}): any {
 	Cache.init(); // will only initalize it once
 
-	return async (req: Request, res: Response, next: NextFunction) => {
+	return async (req: Request, res: Response, next: NextFunction): Promise<any> => {
 		const bucket_id = opts.bucket || req.originalUrl.replace(API_PREFIX_TRAILING_SLASH, "");
 		var user_id = getIpAdress(req);
 		if (!opts.onylIp && req.user_id) user_id = req.user_id;