diff --git a/api/js/etemplate/Et2Date/Et2DateReadonly.ts b/api/js/etemplate/Et2Date/Et2DateReadonly.ts
index 9b2732bd2f..97c502253e 100644
--- a/api/js/etemplate/Et2Date/Et2DateReadonly.ts
+++ b/api/js/etemplate/Et2Date/Et2DateReadonly.ts
@@ -82,11 +82,6 @@ export class Et2DateReadonly extends Et2Widget(LitElement) implements et2_IDetac
 	{
 		// nope
 	}
-
-	loadingFinished()
-	{
-		// already done, I'm a wc with no children
-	}
 }
 
 // @ts-ignore TypeScript is not recognizing that this widget is a LitElement
diff --git a/api/js/etemplate/Et2Description/Et2Description.ts b/api/js/etemplate/Et2Description/Et2Description.ts
index 955ccafaf7..3772aa9a93 100644
--- a/api/js/etemplate/Et2Description/Et2Description.ts
+++ b/api/js/etemplate/Et2Description/Et2Description.ts
@@ -79,6 +79,8 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
 		this.extra_link_target = "_browser";
 		this.href = "";
 		this.value = "";
+
+		this._handleClick = this._handleClick.bind(this);
 	}
 
 	set_value(value)
@@ -101,7 +103,7 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
 		}
 
 		// Do we do this here, or in transformAttributes()?
-		if(!this.no_lang)
+		if(_value && !this.no_lang)
 		{
 			_value = this.egw().lang(_value);
 		}
@@ -146,11 +148,11 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
 
 	async firstUpdated()
 	{
-		this.removeEventListener('click.extra_link');
+		this.removeEventListener('click.extra_link', this._handleClick);
 		if(this.extra_link_popup || this.mime)
 		{
 			// Add click listener
-			this.addEventListener('click.extra_link', this._handleClick.bind(this));
+			this.addEventListener('click.extra_link', this._handleClick);
 		}
 	}
 
@@ -207,11 +209,6 @@ export class Et2Description extends Et2Widget(LitElement) implements et2_IDetach
 	{
 		// nope
 	}
-
-	loadingFinished()
-	{
-		// already done, I'm a wc with no children
-	}
 }
 
 // @ts-ignore TypeScript is not recognizing that this widget is a LitElement