diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 767329db2ca321de487204fcac28eaf0177f90e4..07684f9e9d516485d6f993d0d16621b9fa5b4cbf 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -429,12 +429,12 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
     /**
      * Returns the configured build discarder for this job, via {@link BuildDiscarderProperty}, or null if none.
      */
-    public BuildDiscarder getBuildDiscarder() {
+    public synchronized BuildDiscarder getBuildDiscarder() {
         BuildDiscarderProperty prop = getProperty(BuildDiscarderProperty.class);
         return prop != null ? prop.getStrategy() : /* settings compatibility */ logRotator;
     }
 
-    public void setBuildDiscarder(BuildDiscarder bd) throws IOException {
+    public synchronized void setBuildDiscarder(BuildDiscarder bd) throws IOException {
         BulkChange bc = new BulkChange(this);
         try {
             removeProperty(BuildDiscarderProperty.class);