diff --git a/src/app/semantic-enrichment/semantic-enrichment.component.ts b/src/app/semantic-enrichment/semantic-enrichment.component.ts
index 754a5b2969e8fc9141de2279ff108cb5d084b91a..cf8f8a93ccd1ef2e956b0e97e65cc32dcc7626e2 100644
--- a/src/app/semantic-enrichment/semantic-enrichment.component.ts
+++ b/src/app/semantic-enrichment/semantic-enrichment.component.ts
@@ -125,10 +125,10 @@ export class SemanticEnrichmentComponent implements OnInit {
     mappingData.fdpToken = this.data.fdpToken;
     mappingData.dataConcepts = [];
     this.response.forEach((data: KeywordResponse) => {
+      const concepts = new DataConcept();
+      concepts.id = data.id;
+      concepts.iris = [];
       if (data.keywords) {
-        const concepts = new DataConcept();
-        concepts.id = data.id;
-        concepts.iris = [];
         Object.values(data.keywords).forEach((value: ESModel) => {
 
           if (value && value.results) {
@@ -138,12 +138,14 @@ export class SemanticEnrichmentComponent implements OnInit {
               }
             });
           }
-          if (this.autocompleteMap.get(data.id) && this.autocompleteMap.get(data.id).length > 0) {
-            this.autocompleteMap.get(data.id).forEach((result: Result) => concepts.iris.push(result.source.document.iri));
-          }
-          mappingData.dataConcepts.push(concepts);
         });
       }
+      if (this.autocompleteMap.get(data.id) && this.autocompleteMap.get(data.id).length > 0) {
+        this.autocompleteMap.get(data.id).forEach((result: Result) => concepts.iris.push(result.source.document.iri));
+      }
+      if (concepts) {
+        mappingData.dataConcepts.push(concepts);
+      }
     });
 
     console.log(mappingData);