diff --git a/ui-ngx/src/app/shared/pipe/key-value-not-empty.pipe.ts b/ui-ngx/src/app/shared/pipe/key-value-not-empty.pipe.ts
index 60b09bab0b..d657564982 100644
--- a/ui-ngx/src/app/shared/pipe/key-value-not-empty.pipe.ts
+++ b/ui-ngx/src/app/shared/pipe/key-value-not-empty.pipe.ts
@@ -24,6 +24,7 @@ import {
   PipeTransform
 } from '@angular/core';
 import { KeyValue } from "@angular/common";
+import { isDefinedAndNotNull } from "@core/utils";
 
 @Pipe({
   name: 'keyValueIsNotEmpty',
@@ -51,7 +52,7 @@ export class KeyValueIsNotEmptyPipe implements PipeTransform {
     if (differChanges) {
       this.keyValues = [];
       differChanges.forEachItem((r: KeyValueChangeRecord<string, unknown>) => {
-        if (r.currentValue !== null && r.currentValue !== undefined) {
+        if (isDefinedAndNotNull(r.currentValue)) {
           this.keyValues.push(this.makeKeyValuePair(r.key, r.currentValue!));
         }
       });