diff --git a/src/config.service.ts b/src/config.service.ts
index e0ddfa50..28df30c0 100644
--- a/src/config.service.ts
+++ b/src/config.service.ts
@@ -24,6 +24,16 @@ export class WhatsappConfigService {
     return this.configService.get('WHATSAPP_API_PORT', '3000');
   }
 
+  get baseUrl(): string {
+    let baseUrl = this.configService.get('WAHA_BASE_URL', '');
+    if (!baseUrl) {
+      // combine schema+hostname+port
+      baseUrl = `${this.schema}://${this.hostname}:${this.port}`;
+    }
+    // remove / at the end
+    return baseUrl.replace(/\/$/, '');
+  }
+
   get mimetypes(): string[] {
     if (!this.shouldDownloadMedia) {
       return ['mimetype/ignore-all-media'];
diff --git a/src/core/media/local/MediaLocalStorageConfig.ts b/src/core/media/local/MediaLocalStorageConfig.ts
index e2634a2a..09da4760 100644
--- a/src/core/media/local/MediaLocalStorageConfig.ts
+++ b/src/core/media/local/MediaLocalStorageConfig.ts
@@ -8,7 +8,7 @@ export class MediaLocalStorageConfig {
   constructor(private config: WhatsappConfigService) {}
 
   get filesURL(): string {
-    return `${this.config.schema}://${this.config.hostname}:${this.config.port}${this.filesUri}/`;
+    return `${this.config.baseUrl}${this.filesUri}/`;
   }
 
   get filesFolder(): string {