1 files changed, 2 insertions, 4 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java b/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java
index 2b0e6b7d01..f9eed7fef3 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSingleSelect.java
@@ -230,10 +230,8 @@ public abstract class AbstractSingleSelect<T> extends AbstractListing<T>
         T oldSelection = getSelectedItem().orElse(getEmptyValue());
         doSetSelectedKey(key);
 
-        // Update diffstate so that a change will be sent to the client if the
-        // selection is changed to its original value
-        updateDiffstate("selectedItemKey",
-                key == null ? Json.createNull() : Json.create(key));
+        // Set diffstate to something that will always send selection to client
+        updateDiffstate("selectedItemKey", Json.createObject());
 
         fireEvent(new SingleSelectionEvent<>(AbstractSingleSelect.this,
                 oldSelection, true));