diff --git a/spinetoolbox/spine_db_editor/mvcmodels/pivot_table_models.py b/spinetoolbox/spine_db_editor/mvcmodels/pivot_table_models.py
index f1b21b6b1..cf1f67a34 100644
--- a/spinetoolbox/spine_db_editor/mvcmodels/pivot_table_models.py
+++ b/spinetoolbox/spine_db_editor/mvcmodels/pivot_table_models.py
@@ -474,9 +474,9 @@ def add_to_model(self, db_map_data):
     def remove_from_model(self, data, return_early=False):
         if not data:
             return
+        row_count, column_count = self.model.remove_from_model(data)
         if return_early:
             return
-        row_count, column_count = self.model.remove_from_model(data)
         frozen_values = self.model.frozen_values(data)
         if frozen_values:
             self.frozen_values_removed.emit(frozen_values)