diff --git a/playbooks/roles/gerrit/templates/gerrit.config.j2 b/playbooks/roles/gerrit/templates/gerrit.config.j2
index 2ab3f2a626..1798f53b23 100644
--- a/playbooks/roles/gerrit/templates/gerrit.config.j2
+++ b/playbooks/roles/gerrit/templates/gerrit.config.j2
@@ -87,6 +87,8 @@
 	move = false
 # Keep pre-3.4 behavior
 	mergeabilityComputationBehavior = API_REF_UPDATED_AND_CHANGE_REINDEX
+# Explicitly enable this to avoid problems if the default changes
+	conflictsPredicateEnabled = true
 [receive]
 	maxObjectSizeLimit = 100 m
 	enableSignedPush = false