diff --git a/lib/galaxy/objectstore/s3.py b/lib/galaxy/objectstore/s3.py
index 992c7fb968b..71d11b7a1cf 100644
--- a/lib/galaxy/objectstore/s3.py
+++ b/lib/galaxy/objectstore/s3.py
@@ -716,6 +716,14 @@ class S3ObjectStore(ObjectStore, CloudConfigMixin):
     def get_store_usage_percent(self):
         return 0.0
 
+    def shutdown(self):
+        self.running = False
+        thread = getattr(self, 'cache_monitor_thread', None)
+        if thread:
+            log.debug("Shutting down thread")
+            self.sleeper.wake()
+            thread.join(5)
+
 
 class SwiftObjectStore(S3ObjectStore):
     """