diff --git a/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts b/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts
index 8c6a69506..56d260d4d 100644
--- a/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts
+++ b/apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts
@@ -53,9 +53,9 @@ export class TransformDataSourceInResponseInterceptor<
     return next.handle().pipe(
       map((data: any) => {
         if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-          const valueMap = {
-            ...(hasRole(user, 'ADMIN') ? {} : this.encodedDataSourceMap)
-          };
+          const valueMap = hasRole(user, 'ADMIN')
+            ? {}
+            : { ...this.encodedDataSourceMap };
 
           if (isExportMode) {
             const ghostfolioDataSources = this.configurationService.get(
@@ -70,6 +70,10 @@ export class TransformDataSourceInResponseInterceptor<
             }
           }
 
+          if (Object.keys(valueMap).length === 0) {
+            return data;
+          }
+
           data = redactPaths({
             valueMap,
             object: data,