diff --git a/repertory/librepertory/src/drives/eviction.cpp b/repertory/librepertory/src/drives/eviction.cpp
index f032b390..d0a648fc 100644
--- a/repertory/librepertory/src/drives/eviction.cpp
+++ b/repertory/librepertory/src/drives/eviction.cpp
@@ -88,6 +88,10 @@ void eviction::service_function() {
     }
   }
 
+  if (get_stop_requested()) {
+    return;
+  }
+
   unique_mutex_lock lock(get_mutex());
   if (get_stop_requested()) {
     return;