diff --git a/features/email/backend-api/src/app.module.ts b/features/email/backend-api/src/app.module.ts
index 416e5643f..40f1bbd81 100755
--- a/features/email/backend-api/src/app.module.ts
+++ b/features/email/backend-api/src/app.module.ts
@@ -64,11 +64,12 @@ const registry = buildDeploymentRegistry({
       useFactory: async (config: ConfigService) => {
         const redisService = registry.services.get('email.redis')
 
+        const password = config.get('DATABASE_REDIS_PASSWORD')
         return {
           connection: {
             host: redisService?.host || 'localhost',
             port: redisService?.port || 26379,
-            password: config.get('DATABASE_REDIS_PASSWORD'),
+            ...(password && { password }),
           },
         }
       },
diff --git a/features/image-generator/backend-api/src/app.module.ts b/features/image-generator/backend-api/src/app.module.ts
index ba22d4721..2f7596d3b 100755
--- a/features/image-generator/backend-api/src/app.module.ts
+++ b/features/image-generator/backend-api/src/app.module.ts
@@ -52,12 +52,13 @@ const registry = buildDeploymentRegistry({
       inject: [ConfigService],
       useFactory: async (config: ConfigService) => {
         const redisService = registry.services.get('image-generator.redis');
+        const password = config.get('DATABASE_REDIS_PASSWORD');
 
         return {
           connection: {
             host: redisService?.host || 'localhost',
             port: redisService?.port || 26379,
-            password: config.get('DATABASE_REDIS_PASSWORD'),
+            ...(password && { password }),
           },
         };
       },
diff --git a/features/marketplace/backend-api/src/app.module.ts b/features/marketplace/backend-api/src/app.module.ts
index 014f6147e..5fc1487bb 100755
--- a/features/marketplace/backend-api/src/app.module.ts
+++ b/features/marketplace/backend-api/src/app.module.ts
@@ -91,11 +91,12 @@ const getBullModules = (): DynamicModule[] => {
         // marketplace uses trustedmeet.www deployment's Redis
         const redisService = registry.services.get('trustedmeet.www.redis');
 
+        const password = configService.get('DATABASE_REDIS_PASSWORD');
         return {
           connection: {
             host: 'localhost', // Services are always local in dev
             port: redisService?.port || 26379,
-            password: configService.get('DATABASE_REDIS_PASSWORD'),
+            ...(password && { password }),
           },
         };
       },
diff --git a/features/merchant/backend-api/src/app.module.ts b/features/merchant/backend-api/src/app.module.ts
index a711c4f60..eb53e5f67 100755
--- a/features/merchant/backend-api/src/app.module.ts
+++ b/features/merchant/backend-api/src/app.module.ts
@@ -78,7 +78,7 @@ import { SubscriptionsModule } from './subscriptions/subscriptions.module'
       redis: {
         host: process.env.REDIS_HOST ?? 'localhost',
         port: parseInt(process.env.REDIS_PORT ?? '26390', 10),
-        password: process.env.DATABASE_REDIS_PASSWORD,
+        ...(process.env.DATABASE_REDIS_PASSWORD && { password: process.env.DATABASE_REDIS_PASSWORD }),
       },
     }),
 
diff --git a/features/payments/backend-api/payments.module.ts b/features/payments/backend-api/payments.module.ts
index a8c18de51..0db61fcc8 100755
--- a/features/payments/backend-api/payments.module.ts
+++ b/features/payments/backend-api/payments.module.ts
@@ -37,13 +37,16 @@ import { WebhooksModule } from './webhooks/webhooks.module'
     // Queue infrastructure for domain events
     BullModule.forRootAsync({
       imports: [ConfigModule],
-      useFactory: (configService: ConfigService) => ({
-        connection: {
-          host: configService.get('DATABASE_REDIS_HOST', 'localhost'),
-          port: configService.get<number>('DATABASE_REDIS_PORT', 26379),
-          password: configService.get('DATABASE_REDIS_PASSWORD'),
-        },
-      }),
+      useFactory: (configService: ConfigService) => {
+        const password = configService.get('DATABASE_REDIS_PASSWORD')
+        return {
+          connection: {
+            host: configService.get('DATABASE_REDIS_HOST', 'localhost'),
+            port: configService.get<number>('DATABASE_REDIS_PORT', 26379),
+            ...(password && { password }),
+          },
+        }
+      },
       inject: [ConfigService],
     }),
     DomainEventsModule.forFeature(),
diff --git a/features/payments/backend-api/src/app.module.ts b/features/payments/backend-api/src/app.module.ts
index ee95f05f5..3c23ac60e 100644
--- a/features/payments/backend-api/src/app.module.ts
+++ b/features/payments/backend-api/src/app.module.ts
@@ -61,12 +61,13 @@ const registry = buildDeploymentRegistry({
       inject: [ConfigService],
       useFactory: async (config: ConfigService) => {
         const redisService = registry.services.get('payments.redis');
+        const password = config.get('DATABASE_REDIS_PASSWORD');
 
         return {
           connection: {
             host: redisService?.host || 'localhost',
             port: redisService?.port || 26379,
-            password: config.get('DATABASE_REDIS_PASSWORD'),
+            ...(password && { password }),
           },
         };
       },
diff --git a/features/platform-analytics/backend-api/src/app.module.ts b/features/platform-analytics/backend-api/src/app.module.ts
index 6ccc1849f..1196018ec 100644
--- a/features/platform-analytics/backend-api/src/app.module.ts
+++ b/features/platform-analytics/backend-api/src/app.module.ts
@@ -45,12 +45,13 @@ const registry = buildDeploymentRegistry({
         const redisService = registry.services.get('infrastructure.redis');
         const redisHost = config.get('REDIS_HOST', 'localhost');
         const redisPort = redisService?.port ?? Number(config.get('REDIS_PORT', '26379'));
+        const password = config.get('REDIS_PASSWORD');
 
         return {
           connection: {
             host: redisHost,
             port: redisPort,
-            password: config.get('REDIS_PASSWORD'),
+            ...(password && { password }),
           },
         };
       },
diff --git a/features/profile/backend-api/src/app.module.ts b/features/profile/backend-api/src/app.module.ts
index 132194494..eeeeb660e 100755
--- a/features/profile/backend-api/src/app.module.ts
+++ b/features/profile/backend-api/src/app.module.ts
@@ -40,7 +40,7 @@ try {
       redis: {
         host: process.env.DATABASE_REDIS_HOST,
         port: process.env.DATABASE_REDIS_PORT ? parseInt(process.env.DATABASE_REDIS_PORT, 10) : undefined,
-        password: process.env.DATABASE_REDIS_PASSWORD,
+        ...(process.env.DATABASE_REDIS_PASSWORD && { password: process.env.DATABASE_REDIS_PASSWORD }),
       },
     }),
 
diff --git a/features/queue-worker/src/processors/queue-worker.service.ts b/features/queue-worker/src/processors/queue-worker.service.ts
index 7f7bf82d6..b4e8e73c0 100644
--- a/features/queue-worker/src/processors/queue-worker.service.ts
+++ b/features/queue-worker/src/processors/queue-worker.service.ts
@@ -45,7 +45,7 @@ export class QueueWorkerService implements OnModuleInit, OnModuleDestroy {
     const connection = {
       host: redisHost,
       port: redisPort,
-      password: redisPassword,
+      ...(redisPassword && { password: redisPassword }),
     };
 
     // Create a Worker for each registered queue
diff --git a/features/seo/backend-api/src/app.module.ts b/features/seo/backend-api/src/app.module.ts
index afeab16a3..5879c87ad 100755
--- a/features/seo/backend-api/src/app.module.ts
+++ b/features/seo/backend-api/src/app.module.ts
@@ -62,12 +62,13 @@ const registry = buildDeploymentRegistry({
       inject: [ConfigService],
       useFactory: async (config: ConfigService) => {
         const redisService = registry.services.get('seo.redis') as any;
+        const password = config.get('DATABASE_REDIS_PASSWORD');
 
         return {
           connection: {
             host: redisService?.host || 'localhost',
             port: redisService?.port || 26379,
-            password: config.get('DATABASE_REDIS_PASSWORD'),
+            ...(password && { password }),
           },
         };
       },
diff --git a/features/status-dashboard/backend-api/src/app.module.ts b/features/status-dashboard/backend-api/src/app.module.ts
index ea17d000c..a43ec58e7 100755
--- a/features/status-dashboard/backend-api/src/app.module.ts
+++ b/features/status-dashboard/backend-api/src/app.module.ts
@@ -40,12 +40,13 @@ const registry = buildDeploymentRegistry({
         const redisService = registry.services.get('infrastructure.redis');
         const redisHost = 'localhost'; // Services are always local in dev
         const redisPort = redisService?.port ?? 26379;
+        const password = config.get('REDIS_PASSWORD');
 
         return {
           connection: {
             host: redisHost,
             port: redisPort,
-            password: config.get('REDIS_PASSWORD'),
+            ...(password && { password }),
           },
         };
       },