diff --git a/source/blender/asset_system/intern/asset_library_all.cc b/source/blender/asset_system/intern/asset_library_all.cc
index 42f5f350b98..8e4dba9700e 100644
--- a/source/blender/asset_system/intern/asset_library_all.cc
+++ b/source/blender/asset_system/intern/asset_library_all.cc
@@ -18,18 +18,21 @@ AllAssetLibrary::AllAssetLibrary() : AssetLibrary(ASSET_LIBRARY_ALL) {}
 
 void AllAssetLibrary::rebuild(const bool reload_catalogs)
 {
-  /* Start with empty catalog storage. */
-  catalog_service = std::make_unique<AssetCatalogService>(AssetCatalogService::read_only_tag());
+  /* Start with empty catalog storage. Don't do this directly in #this.catalog_service to avoid
+   * race conditions. Rather build into a new service and replace the current one when done. */
+  std::unique_ptr<AssetCatalogService> new_catalog_service = std::make_unique<AssetCatalogService>(
+      AssetCatalogService::read_only_tag());
 
   AssetLibrary::foreach_loaded(
       [&](AssetLibrary &nested) {
         if (reload_catalogs) {
           nested.catalog_service->reload_catalogs();
         }
-        catalog_service->add_from_existing(*nested.catalog_service);
+        new_catalog_service->add_from_existing(*nested.catalog_service);
       },
       false);
-  catalog_service->rebuild_tree();
+  new_catalog_service->rebuild_tree();
+  this->catalog_service = std::move(new_catalog_service);
 }
 
 void AllAssetLibrary::refresh_catalogs()