diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcd2fe6313b..4789d8e4501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
  - We fixed an issue where double clicking on an entry in the integrity check dialog resulted in an exception [#3485](https://github.com/JabRef/jabref/issues/3485)
  - We fixed an issue where the entry type could sometimes not be changed when the entry editor was open [#3435](https://github.com/JabRef/jabref/issues/3435)
  - We fixed an issue where dropping a pdf on the entry table and renaming it triggered an exception [#3490](https://github.com/JabRef/jabref/issues/3490)
+ - We fixed an issue where integrating external changes to a bib file caused instability [#3498](https://github.com/JabRef/jabref/issues/3498)
  - We fixed an issue where fetched entries from the ACM fetcher could not be imported [#3500](https://github.com/JabRef/jabref/issues/3500)
 
  ### Removed
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
index e4ba4845642..926bc13fce5 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -136,6 +136,7 @@ public boolean hasBeenModifiedExternally() {
 
     public void markExternalChangesAsResolved() {
         updatedExternally = false;
+        markAsSaved();
     }
 
     public void markAsSaved() {