diff --git a/src/routes/attachments.ts b/src/routes/attachments.ts
index 2e635b43..acc7604d 100644
--- a/src/routes/attachments.ts
+++ b/src/routes/attachments.ts
@@ -52,6 +52,7 @@ router.get("/:channel_id/:id/:filename", async (req: Request, res: Response) =>
 	const type = await FileType.fromBuffer(file);
 
 	res.set("Content-Type", type?.mime);
+	res.set("Cache-Control", "public, max-age=31536000");
 
 	return res.send(file);
 });
diff --git a/src/routes/avatars.ts b/src/routes/avatars.ts
index 321ae02e..fea7c5f4 100644
--- a/src/routes/avatars.ts
+++ b/src/routes/avatars.ts
@@ -52,6 +52,7 @@ router.get("/:user_id/:id", async (req: Request, res: Response) => {
 	const type = await FileType.fromBuffer(file);
 
 	res.set("Content-Type", type?.mime);
+	res.set("Cache-Control", "public, max-age=31536000");
 
 	return res.send(file);
 });
diff --git a/src/start.ts b/src/start.ts
index 54228a5f..822a749f 100644
--- a/src/start.ts
+++ b/src/start.ts
@@ -7,7 +7,10 @@ if (process.env.STORAGE_LOCATION) {
 	if (!process.env.STORAGE_LOCATION.startsWith("/")) {
 		process.env.STORAGE_LOCATION = __dirname + "/../" + process.env.STORAGE_LOCATION;
 	}
-} else process.env.STORAGE_LOCATION = __dirname + "/../files/";
+} else {
+	process.env.STORAGE_LOCATION = __dirname + "/../files/";
+	process.env.STORAGE_PROVIDER = "file";
+}
 
 const server = new CDNServer({ port: Number(process.env.PORT) || 3003 });
 server