diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/PVWidget.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/PVWidget.java
index 0f66921143..35316eb64e 100644
--- a/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/PVWidget.java
+++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/widgets/PVWidget.java
@@ -82,6 +82,7 @@ protected void defineProperties (final List> properties )
{
super.defineProperties(properties);
properties.add(pv_name = propPVName.createProperty(this, ""));
+ pv_name.addPropertyListener((property, oldValue, newValue) -> pv_value.setValue(null));
properties.add(pv_value = runtimePropPVValue.createProperty(this, null));
properties.add(alarm_border = propBorderAlarmSensitive.createProperty(this, true));
}