diff --git a/kernel/driver.cc b/kernel/driver.cc
index d8b104117..726e25302 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -158,7 +158,6 @@ extern "C" {
 
 void yosys_atexit()
 {
-	RTLIL::OwningIdString::collect_garbage(false);
 #if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
 	if (!yosys_history_file.empty()) {
 #if defined(YOSYS_ENABLE_READLINE)
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index bf59302f8..4e4abed20 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -260,6 +260,7 @@ void yosys_shutdown()
 
 	delete yosys_design;
 	yosys_design = NULL;
+	RTLIL::OwningIdString::collect_garbage();
 
 	for (auto f : log_files)
 		if (f != stderr)