1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java b/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java
index 540d8f2d8a..e6f8ed2926 100644
--- a/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java
+++ b/server/src/main/java/com/vaadin/ui/components/grid/GridDragSource.java
@@ -256,10 +256,10 @@ public class GridDragSource<T> extends DragSourceExtension<Grid<T>> {
 
     @Override
     public void remove() {
-        super.remove();
-
         getParent().getDataCommunicator()
                 .removeDataGenerator(dragDataGenerator);
+
+        super.remove();
     }
 
     @Override