diff --git a/server/src/services/storage.service.ts b/server/src/services/storage.service.ts
index bcfb34535c..5b08204bf9 100644
--- a/server/src/services/storage.service.ts
+++ b/server/src/services/storage.service.ts
@@ -101,6 +101,10 @@ export class StorageService extends BaseService {
         const savedValue = await this.systemMetadataRepository.get(SystemMetadataKey.MediaLocation);
         let previous = savedValue?.location || '';
 
+        if (!previous && this.configRepository.getEnv().storage.mediaLocation) {
+          previous = current;
+        }
+
         if (!previous) {
           previous = path.startsWith('upload/') ? 'upload' : '/usr/src/app/upload';
         }