diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java
index f945064..ea17f3f 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/AbstractDataGrid.java
@@ -56,8 +56,10 @@ public abstract class AbstractDataGrid<T> extends VerticalLayout {
 		Binder<T> binder = editor.getBinder();
 		editor.addSaveListener(ev -> {
 			hasChanges = true;
-			for (Consumer<T> consumer : successConsumers) {
-				consumer.accept(ev.getBean());
+			if (editedListener.editObject != null) {
+				for (Consumer<T> consumer : successConsumers) {
+					consumer.accept(ev.getBean());
+				}
 			}
 			dataProvider.refreshAll();
 		});