diff --git a/kernel/rtlil_bufnorm.cc b/kernel/rtlil_bufnorm.cc
index 9297a5087..06fe2bbd9 100644
--- a/kernel/rtlil_bufnorm.cc
+++ b/kernel/rtlil_bufnorm.cc
@@ -91,9 +91,9 @@ struct RTLIL::SigNormIndex
 			else
 				cells_to_remove.push_back(cell);
 
-			for (auto cell : cells_to_remove)
-				module->remove(cell);
 		}
+		for (auto cell : cells_to_remove)
+			module->remove(cell);
 
 		for (auto portname : module->ports) {
 			Wire *wire = module->wire(portname);