1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index e6b5050d90..801b925e2a 100644
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -277,10 +277,10 @@ public class RpcDataProviderExtension extends AbstractExtension {
             }
 
             pinnedItemIds.remove(itemId);
-            final Integer removedIndex = indexToItemId.inverse().remove(itemId);
-            if (removedIndex == null
-                    || !activeRange.contains(removedIndex.intValue())) {
+            final Integer index = indexToItemId.inverse().get(itemId);
+            if (index == null || !activeRange.contains(index.intValue())) {
                 itemIdToKey.remove(itemId);
+                indexToItemId.remove(index);
             }
         }