diff --git a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java
index cec1b8bc0..10ae5d528 100644
--- a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java
@@ -81,6 +81,7 @@ public class MySQLDatabaseHandler<T> extends AbstractJSONDatabaseHandler<T> {
                         Thread.sleep(25);
                     } catch (InterruptedException e) {
                         plugin.logError("Thread sleep error " + e.getMessage());
+                        Thread.currentThread().interrupt();
                     }
                 }
                 // Cancel
diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
index e3d3c36f4..8aceea00b 100644
--- a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
+++ b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
@@ -97,6 +97,7 @@ public class YamlDatabaseHandler<T> extends AbstractDatabaseHandler<T> {
                         Thread.sleep(25);
                     } catch (InterruptedException e) {
                         plugin.logError("Thread sleep error " + e.getMessage());
+                        Thread.currentThread().interrupt();
                     }
                 }
                 // Cancel