diff --git a/src/format/KeePass2XmlWriter.cpp b/src/format/KeePass2XmlWriter.cpp
index 3c03a0aa..034ca548 100644
--- a/src/format/KeePass2XmlWriter.cpp
+++ b/src/format/KeePass2XmlWriter.cpp
@@ -362,7 +362,10 @@ void KeePass2XmlWriter::writeEntry(const Entry* entry)
     }
 
     writeAutoType(entry);
-    writeEntryHistory(entry);
+    // write history only for entries that are not history items
+    if (entry->parent()) {
+        writeEntryHistory(entry);
+    }
 
     m_xml.writeEndElement();
 }