diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
index c6e3105122..5cfd524d62 100644
--- a/src/app/core/submission/submission-response-parsing.service.ts
+++ b/src/app/core/submission/submission-response-parsing.service.ts
@@ -117,7 +117,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
                   .forEach((metdadataId) => {
                     const entry = item.sections[sectionId][metdadataId];
                     // If entry is not an array, for sure is not a section of type form
-                    if (isNotNull(entry) && Array.isArray(entry)) {
+                    if (Array.isArray(entry)) {
                       normalizedSectionData[metdadataId] = [];
                       entry.forEach((valueItem) => {
                         // Parse value and normalize it
diff --git a/src/app/shared/chips/chips.component.ts b/src/app/shared/chips/chips.component.ts
index 802a56cefd..1283decc9f 100644
--- a/src/app/shared/chips/chips.component.ts
+++ b/src/app/shared/chips/chips.component.ts
@@ -108,7 +108,7 @@ export class ChipsComponent implements OnChanges {
       }
 
       this.cdr.detectChanges();
-      if (!chipsItem.hasIcons() || (chipsItem.hasIcons() && !chipsItem.hasVisibleIcons()) || field) {
+      if (!chipsItem.hasIcons() || !chipsItem.hasVisibleIcons() || field) {
         this.tipText = textToDisplay;
         tooltip.open();
       }