diff --git a/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java b/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java
index ead186b36..6dce02444 100644
--- a/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java
+++ b/src/main/java/de/metas/ui/web/handlingunits/HUEditorView.java
@@ -314,6 +314,10 @@ public void notifyRecordsChanged(final Set<TableRecordReference> recordRefs)
 				.filter(recordRef -> I_M_HU.Table_Name.equals(recordRef.getTableName()))
 				.map(recordRef -> recordRef.getRecord_ID())
 				.collect(ImmutableSet.toImmutableSet());
+		if(huIdsToCheck.isEmpty())
+		{
+			return;
+		}
 
 		final boolean containsSomeRecords = rowsBuffer.containsAnyOfHUIds(huIdsToCheck);
 		if (!containsSomeRecords)