diff --git a/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy b/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
index 3fe1647d..56c3f7cf 100644
--- a/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
+++ b/core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
@@ -287,6 +287,7 @@ class H2HostCache extends HostCache {
     }
     @Override
     public synchronized void stop() {
+        timer.cancel()
         sql.close()
     }
     @Override