diff --git a/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java b/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java
index 6ace9d64537..cfa035a6de7 100644
--- a/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java
+++ b/src/main/java/org/jabref/logic/search/indexing/BibFieldsIndexer.java
@@ -285,8 +285,10 @@ private void removeFromIndex(BibEntry entry) {
     }
 
     public void updateEntry(BibEntry entry, Field field) {
-        removeField(entry, field);
-        insertField(entry, field);
+        synchronized (entry.getId()) {
+            removeField(entry, field);
+            insertField(entry, field);
+        }
     }
 
     private void insertField(BibEntry entry, Field field) {