diff --git a/src/KKdLib/database/aet.cpp b/src/KKdLib/database/aet.cpp
index 234f7cb3..9ab62ec4 100644
--- a/src/KKdLib/database/aet.cpp
+++ b/src/KKdLib/database/aet.cpp
@@ -397,8 +397,10 @@ void aet_database::remove_aet_set(uint32_t set_id, uint32_t index,
         auto i_end = aet_sets.end();
         auto i = i_begin;
         while (i != i_end)
-            if (i->id == set_id)
+            if (i->id == set_id) {
                 i = aet_sets.erase(i);
+                i_end = aet_sets.end();
+            }
             else
                 i++;
     }
diff --git a/src/KKdLib/database/sprite.cpp b/src/KKdLib/database/sprite.cpp
index b70ca178..87408318 100644
--- a/src/KKdLib/database/sprite.cpp
+++ b/src/KKdLib/database/sprite.cpp
@@ -395,8 +395,10 @@ void sprite_database::remove_spr_set(uint32_t set_id, uint32_t index,
         auto i_end = spr_sets.end();
         auto i = i_begin;
         while (i != i_end)
-            if (i->id == set_id)
+            if (i->id == set_id) {
                 i = spr_sets.erase(i);
+                i_end = spr_sets.end();
+            }
             else
                 i++;
     }