diff --git a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsOptimizationPatch.java b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsOptimizationPatch.java
index 0a60c8763..4a1461136 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsOptimizationPatch.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/db/patches/KillsOptimizationPatch.java
@@ -43,6 +43,15 @@ public class KillsOptimizationPatch extends Patch {
     @Override
     protected void applyPatch() {
         try {
+            if (hasTable(tempTableName) && hasColumn(tempTableName, KillsTable.VICTIM_UUID)) {
+                // In this case a patch has made a table with almost correct schema to a temporary table.
+                renameTable(tempTableName, tableName);
+                return;
+            } else if (hasColumn(tableName, KillsTable.VICTIM_UUID)) {
+                // In this case a patch has made a table with almost correct schema, but something is not right.
+                return;
+            }
+
             tempOldTable();
             execute(KillsTable.createTableSQL(dbType));