diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index edbed947e..94f14f209 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -904,7 +904,8 @@ void Group::resolveConflict(Entry* existingEntry, Entry* otherEntry)
             if (timeExisting < timeOther) {
                 // only if other entry is newer, replace existing one
                 removeEntry(existingEntry);
-                addEntry(otherEntry->clone(Entry::CloneNoFlags));
+                clonedEntry = otherEntry->clone(Entry::CloneNoFlags);
+                clonedEntry->setGroup(this);
             }
 
             break;