1 files changed, 19 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java
index b083db3183..2c4dd5be5d 100644
--- a/server/src/com/vaadin/ui/AbstractSelect.java
+++ b/server/src/com/vaadin/ui/AbstractSelect.java
@@ -1675,6 +1675,8 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
         // Clears the item id mapping table
         itemIdMapper.removeAll();
 
+        adjustSelection();
+
         // Notify all listeners
         fireItemSetChange();
     }
@@ -1713,6 +1715,23 @@ public abstract class AbstractSelect extends AbstractField<Object> implements
     }
 
     /**
+     * Removes orphaned ids from selection.
+     */
+    protected void adjustSelection() {
+        Object value = getValue();
+        if (isMultiSelect() && (value instanceof Collection)) {
+            Collection<?> collection = (Collection<?>) value;
+            for (Object id : collection) {
+                if (!containsId(id)) {
+                    unselect(id);
+                }
+            }
+        } else if (!containsId(value)) {
+            unselect(value);
+        }
+    }
+
+    /**
      * Implementation of item set change event.
      */
     private static class ItemSetChangeEvent extends EventObject implements