diff --git a/api/js/etemplate/Et2Link/Et2LinkEntry.ts b/api/js/etemplate/Et2Link/Et2LinkEntry.ts
index 08ed140872..d3bfa3fc7b 100644
--- a/api/js/etemplate/Et2Link/Et2LinkEntry.ts
+++ b/api/js/etemplate/Et2Link/Et2LinkEntry.ts
@@ -175,6 +175,12 @@ export class Et2LinkEntry extends Et2InputWidget(FormControlMixin(ValidateMixin(
 	set only_app(app)
 	{
 		this.__only_app = app || "";
+
+		// If initial value got set before only_app, it still needs app in pre-render value
+		if(this._value && app)
+		{
+			this._value.app = this.__only_app;
+		}
 		if(app)
 		{
 			this.app = app;