diff --git a/projects/common/form-element-component.directive.ts b/projects/common/form-element-component.directive.ts
index d6c661d0a130009c7fd526d211225a03c5ff8aeb..50a9ae34ecb6c20edba0d0117c54783ec474522f 100644
--- a/projects/common/form-element-component.directive.ts
+++ b/projects/common/form-element-component.directive.ts
@@ -34,7 +34,9 @@ export abstract class FormElementComponent extends ElementComponent implements O
         pairwise()
       )
       .subscribe(([prevValue, nextValue] : [string | number | boolean | undefined, string | number | boolean]) => {
-        this.formValueChanged.emit({ id: this.elementModel.id, values: [prevValue, nextValue] });
+        if (nextValue != null) { // invalid input on number fields generates event with null TODO find a better solution
+          this.formValueChanged.emit({ id: this.elementModel.id, values: [prevValue, nextValue] });
+        }
       });
   }