diff --git a/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java b/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java
index 424a6886f41797..5ec307c683b49d 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/SimpleBlobStoreFactory.java
@@ -74,7 +74,7 @@ public static boolean isRemoteCacheOptions(RemoteOptions options) {
   }
 
   public static boolean isDiskCache(RemoteOptions options) {
-    return options.diskCache != null;
+    return options.diskCache != null && !options.diskCache.isEmpty();
   }
 
   private static boolean isRestUrlOptions(RemoteOptions options) {