diff --git a/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java b/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java
index 194f89edd..269574c40 100644
--- a/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java
+++ b/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java
@@ -170,6 +170,7 @@ public boolean isRunning() {
     
     public void stop() {
         terminate();
+        ArchiveUtils.closeQuietly(this.recover);
     }
 
 
@@ -643,8 +644,6 @@ public void unpause() {
 
     synchronized public void terminate() {
         requestState(State.FINISH);
-        // TODO: move this recover-cleanup to manager thread?
-        ArchiveUtils.closeQuietly(this.recover);
     }
     
     /**