diff --git a/src/main/java/io/josemmo/bukkit/plugin/storage/ImageStorage.java b/src/main/java/io/josemmo/bukkit/plugin/storage/ImageStorage.java
index 643613d..e6085d4 100644
--- a/src/main/java/io/josemmo/bukkit/plugin/storage/ImageStorage.java
+++ b/src/main/java/io/josemmo/bukkit/plugin/storage/ImageStorage.java
@@ -352,7 +352,7 @@ public void run() {
                     }
                     key.reset();
                 }
-            } catch (InterruptedException __) {
+            } catch (ClosedWatchServiceException | InterruptedException __) {
                 // Silently ignore exception, this is expected when service shuts down
             } catch (NullPointerException e) {
                 LOGGER.severe("Watch service was stopped before watcher thread", e);