diff --git a/libs/utils/gtest/src/HashMapTestSuite.cc b/libs/utils/gtest/src/HashMapTestSuite.cc
index 6ec34cc8a..070678df9 100644
--- a/libs/utils/gtest/src/HashMapTestSuite.cc
+++ b/libs/utils/gtest/src/HashMapTestSuite.cc
@@ -506,18 +506,18 @@ TEST_F(HashMapTestSuite, IterateStressCapacityAndLoadFactorTest) {
     celix_longHashMap_destroy(lMap);
 }
 
-TEST_F(HashMapTestSuite, IterateWithRemoveTest) {
+TEST_F(HashMapTestSuite, IterateWithRemoveAtIndex0Test) {
     auto* sMap = createStringHashMap(6);
     auto iter1 = celix_stringHashMap_begin(sMap);
     while (!celix_stringHashMapIterator_isEnd(&iter1)) {
-        if (iter1.index % 2 == 0) {
+        if (iter1.index == 0) {
             // note only removing entries where the iter key is even
             celix_stringHashMapIterator_remove(&iter1);
         } else {
-            celix_stringHashMapIterator_next(&iter1);
+            FAIL() << "Should not be reached, because index 0 is always removed";
         }
     }
-    EXPECT_EQ(3, celix_stringHashMap_size(sMap));
+    EXPECT_EQ(0, celix_stringHashMap_size(sMap));
     EXPECT_TRUE(celix_stringHashMapIterator_isEnd(&iter1));
     celix_stringHashMapIterator_next(&iter1);
     EXPECT_TRUE(celix_stringHashMapIterator_isEnd(&iter1));
@@ -530,16 +530,48 @@ TEST_F(HashMapTestSuite, IterateWithRemoveTest) {
             // note only removing entries where the iter index is even
             celix_longHashMapIterator_remove(&iter2);
         } else {
-            celix_longHashMapIterator_next(&iter2);
+            FAIL() << "Should not be reached, because index 0 is always removed";
         }
     }
-    EXPECT_EQ(3, celix_longHashMap_size(lMap));
+    EXPECT_EQ(0, celix_longHashMap_size(lMap));
     EXPECT_TRUE(celix_longHashMapIterator_isEnd(&iter2));
     celix_longHashMapIterator_next(&iter2); // calling next on end iter, does nothing
     EXPECT_TRUE(celix_longHashMapIterator_isEnd(&iter2));
     celix_longHashMap_destroy(lMap);
 }
 
+TEST_F(HashMapTestSuite, IterateWithRemoveAtIndex4Test) {
+    celix_autoptr(celix_string_hash_map_t) sMap = createStringHashMap(6);
+    auto iter1 = celix_stringHashMap_begin(sMap);
+    while (!celix_stringHashMapIterator_isEnd(&iter1)) {
+        if (iter1.index == 4) {
+            // note only removing entries where the iter key is even
+            celix_stringHashMapIterator_remove(&iter1);
+        } else {
+            celix_stringHashMapIterator_next(&iter1);
+        }
+    }
+    EXPECT_EQ(4, celix_stringHashMap_size(sMap));
+    EXPECT_TRUE(celix_stringHashMapIterator_isEnd(&iter1));
+    celix_stringHashMapIterator_next(&iter1);
+    EXPECT_TRUE(celix_stringHashMapIterator_isEnd(&iter1));
+
+    celix_autoptr(celix_long_hash_map_t) lMap = createLongHashMap(6);
+    auto iter2 = celix_longHashMap_begin(lMap);
+    while (!celix_longHashMapIterator_isEnd(&iter2)) {
+        if (iter2.index == 4) {
+            // note only removing entries where the iter index is even
+            celix_longHashMapIterator_remove(&iter2);
+        } else {
+            celix_longHashMapIterator_next(&iter2);
+        }
+    }
+    EXPECT_EQ(4, celix_longHashMap_size(lMap));
+    EXPECT_TRUE(celix_longHashMapIterator_isEnd(&iter2));
+    celix_longHashMapIterator_next(&iter2); // calling next on end iter, does nothing
+    EXPECT_TRUE(celix_longHashMapIterator_isEnd(&iter2));
+}
+
 TEST_F(HashMapTestSuite, IterateEndTest) {
     auto* sMap1 = createStringHashMap(0);
     auto* sMap2 = createStringHashMap(6);
diff --git a/libs/utils/src/celix_hash_map.c b/libs/utils/src/celix_hash_map.c
index aa2dd5721..84b103af1 100644
--- a/libs/utils/src/celix_hash_map.c
+++ b/libs/utils/src/celix_hash_map.c
@@ -764,6 +764,7 @@ void celix_stringHashMapIterator_remove(celix_string_hash_map_iterator_t* iter)
     const char* key = entry->key.strKey;
     celix_stringHashMapIterator_next(iter);
     celix_hashMap_remove(map, key, 0);
+    iter->index -= 1; //decrement index, because of remove
 }
 
 void celix_longHashMapIterator_remove(celix_long_hash_map_iterator_t* iter) {
@@ -772,6 +773,7 @@ void celix_longHashMapIterator_remove(celix_long_hash_map_iterator_t* iter) {
     long key = entry->key.longKey;
     celix_longHashMapIterator_next(iter);
     celix_hashMap_remove(map, NULL, key);
+    iter->index -= 1; //decrement index, because of remove
 }
 
 static int celix_hashMap_nrOfEntriesInBucket(const celix_hash_map_t* map, int bucketIndex) {