diff --git a/api/js/etemplate/Et2Link/Et2Link.ts b/api/js/etemplate/Et2Link/Et2Link.ts
index 9ac0ebca7d..e30a04e2dd 100644
--- a/api/js/etemplate/Et2Link/Et2Link.ts
+++ b/api/js/etemplate/Et2Link/Et2Link.ts
@@ -260,7 +260,15 @@ export class Et2Link extends ExposeMixin<Et2Widget>(Et2Widget(LitElement)) imple
 				{
 					return;
 				}
-				this.dataset[key] = _value[key];
+				// we should not let null value being stored into dataset as 'null'
+				if (_value[key] === null)
+				{
+					this.dataset[key] = "";
+				}
+				else
+				{
+					this.dataset[key] = _value[key];
+				}
 			})
 		}
 		this.requestUpdate("value");