diff --git a/landingPages/dataProvider/dataProvider.service.ts b/landingPages/dataProvider/dataProvider.service.ts
index 940bed5d..dc1b38b7 100644
--- a/landingPages/dataProvider/dataProvider.service.ts
+++ b/landingPages/dataProvider/dataProvider.service.ts
@@ -135,8 +135,10 @@ export class DataProviderService {
                 this.dataProviderInfo.tabs2.push("Other Research Products");
             }
 
-            this.dataProviderInfo.tabs.push({"name": "Metrics", "content": "metricsTab"});
-            this.dataProviderInfo.tabs2.push("Metrics");
+            if(this.dataProviderInfo.tabsInTypes.metricsTab.has(data[1].classid)) {
+                this.dataProviderInfo.tabs.push({"name": "Metrics", "content": "metricsTab"});
+                this.dataProviderInfo.tabs2.push("Metrics");
+            }
 
             if(this.dataProviderInfo.resultTypes.collectedFrom.has(data[1].classid)) {
                 this.dataProviderInfo.resultsBy = "collectedFrom";
diff --git a/utils/entities/dataProviderInfo.ts b/utils/entities/dataProviderInfo.ts
index 1dda23d4..d80d5037 100644
--- a/utils/entities/dataProviderInfo.ts
+++ b/utils/entities/dataProviderInfo.ts
@@ -110,9 +110,7 @@ export class DataProviderInfo {
                             "softwarerepository",
                             "aggregator::softwarerepository",
                             "orprepository"
-                          ])
-        /*
-        ,
+                          ]),
         "metricsTab": new Set<string>(
                         [   "aggregator::datarepository",
                             "aggregator::pubsrepository::institutional",
@@ -120,19 +118,19 @@ export class DataProviderInfo {
                             "aggregator::pubsrepository::journals",
                             "crissystem",
                             "datarepository::unknown",
+                            "infospace",
                             "pubsrepository::institutional",
                             "pubsrepository::journal",
+                            "websource",
                             "pubsrepository::unknown",
+                            "scholarcomminfra",
                             "pubsrepository::thematic",
                             "pubscatalogue::unknown",
-
-                            "infospace",
-                            "scholarcomminfra",
-                            "entityregistry",
-                            "entityregistry::projects",
-                            "entityregistry::repositories"
+                            "softwarerepository",
+                            "aggregator::softwarerepository",
+                            "orprepository"
                         ])
-          */
+
     };
 
     resultsBy: string;