diff --git a/src/db/db/dbLibraryManager.cc b/src/db/db/dbLibraryManager.cc
index c03cf602a..7dde8a647 100644
--- a/src/db/db/dbLibraryManager.cc
+++ b/src/db/db/dbLibraryManager.cc
@@ -112,6 +112,8 @@ LibraryManager::unregister_lib (Library *library)
     return;
   }
 
+  library->remap_to (0);
+
   {
     tl::MutexLocker locker (&m_lock);
 
@@ -124,7 +126,6 @@ LibraryManager::unregister_lib (Library *library)
     }
   }
 
-  library->remap_to (0);
   library->set_id (std::numeric_limits<lib_id_type>::max ());
 
   //  issue the change notification