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 cbe5b4363..3b9addf76 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
@@ -94,6 +94,8 @@ export class TransformDataSourceInResponseInterceptor<
               'watchlist[*].dataSource'
             ]
           });
+
+          data.dataProviderInfo = undefined;
         }
 
         return data;
diff --git a/libs/ui/src/lib/data-provider-credits/data-provider-credits.component.html b/libs/ui/src/lib/data-provider-credits/data-provider-credits.component.html
index 921433620..fb72e72cd 100644
--- a/libs/ui/src/lib/data-provider-credits/data-provider-credits.component.html
+++ b/libs/ui/src/lib/data-provider-credits/data-provider-credits.component.html
@@ -1,5 +1,5 @@
 <small class="text-muted">
-  <ng-container i18n>Market data provided by</ng-container>&nbsp;
+  <ng-container i18n>Market data provided by</ng-container>{{ ' ' }}
   @for (
     dataProviderInfo of dataProviderInfos;
     track dataProviderInfo;
@@ -7,10 +7,7 @@
   ) {
     <a target="_blank" [href]="dataProviderInfo.url">{{
       dataProviderInfo.name
-    }}</a>
-    @if (!last) {
-      ,&nbsp;
-    }
+    }}</a
+    >{{ last ? '.' : ', ' }}
   }
-  .
 </small>