diff --git a/lib/mu-store.cc b/lib/mu-store.cc
index decdd734..efd40b45 100644
--- a/lib/mu-store.cc
+++ b/lib/mu-store.cc
@@ -103,8 +103,7 @@ struct Store::Private {
 
 	~Private() try {
 
-		if (indexer_) // do this here, since it may call back.
-			indexer_->stop();
+		indexer_.reset(); // reset so it cannot call us back
 
 		g_debug("closing store @ %s", properties_.database_path.c_str());
 		if (!read_only_) {