diff --git a/src/platforms/openai.ts b/src/platforms/openai.ts
index 856bd4ef..23fb55c5 100644
--- a/src/platforms/openai.ts
+++ b/src/platforms/openai.ts
@@ -10,7 +10,7 @@ import {
 import { removeBase64Prefix } from '@/utility/image';
 import { cleanUpAiTextResponse } from '@/photo/ai';
 
-const redis = Redis.fromEnv();
+const redis = HAS_REDIS_STORAGE ? Redis.fromEnv() : undefined;
 
 const RATE_LIMIT_IDENTIFIER = 'openai-image-query';
 const RATE_LIMIT_MAX_QUERIES_PER_HOUR = 100;
@@ -20,7 +20,7 @@ const openai = AI_TEXT_GENERATION_ENABLED
   ? createOpenAI({ apiKey: process.env.OPENAI_SECRET_KEY })
   : undefined;
 
-const ratelimit = HAS_REDIS_STORAGE
+const ratelimit = redis
   ? new Ratelimit({
     redis,
     limiter: Ratelimit.slidingWindow(RATE_LIMIT_MAX_QUERIES_PER_HOUR, '1h'),
diff --git a/src/platforms/redis.ts b/src/platforms/redis.ts
index e0512be1..041a6883 100644
--- a/src/platforms/redis.ts
+++ b/src/platforms/redis.ts
@@ -1,5 +1,6 @@
 import { Redis } from '@upstash/redis';
+import { HAS_REDIS_STORAGE } from '@/app/config';
 
-const redis = Redis.fromEnv();
+const redis = HAS_REDIS_STORAGE ? Redis.fromEnv() : undefined;
 
-export const testRedisConnection = () => redis.get('test');
+export const testRedisConnection = () => redis?.get('test');