diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java
index c8add605ca..547a5009a2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java
@@ -33,7 +33,7 @@ public interface MergeabilityCache {
     }
 
     @Override
-    public boolean getIfPresent(ObjectId commit, Ref intoRef,
+    public Boolean getIfPresent(ObjectId commit, Ref intoRef,
         SubmitType submitType, String mergeStrategy) {
       throw new UnsupportedOperationException("Mergeability checking disabled");
     }
@@ -42,6 +42,6 @@ public interface MergeabilityCache {
   public boolean get(ObjectId commit, Ref intoRef, SubmitType submitType,
       String mergeStrategy, Branch.NameKey dest, Repository repo, ReviewDb db);
 
-  public boolean getIfPresent(ObjectId commit, Ref intoRef,
+  public Boolean getIfPresent(ObjectId commit, Ref intoRef,
       SubmitType submitType, String mergeStrategy);
 }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
index d6b6ab8376..a78b6624b6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
@@ -304,7 +304,7 @@ public class MergeabilityCacheImpl implements MergeabilityCache {
   }
 
   @Override
-  public boolean getIfPresent(ObjectId commit, Ref intoRef,
+  public Boolean getIfPresent(ObjectId commit, Ref intoRef,
       SubmitType submitType, String mergeStrategy) {
     return cache.getIfPresent(
         new EntryKey(commit, toId(intoRef), submitType, mergeStrategy));