diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java
index 06288b6206805a..c5ab58ca1a7c09 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java
@@ -308,6 +308,10 @@ public static RootedPath getRootedPathFromLabel(Label label, Environment env)
   protected Map<String, String> declareEnvironmentDependencies(
       Map<String, String> markerData, Environment env, Set<String> keys)
       throws InterruptedException {
+    if (keys.isEmpty()) {
+      return ImmutableMap.of();
+    }
+
     ImmutableMap<String, String> envDep = getEnvVarValues(env, keys);
     if (envDep == null) {
       return null;
@@ -349,6 +353,10 @@ public static ImmutableMap<String, String> getEnvVarValues(Environment env, Set<
   protected boolean verifyEnvironMarkerData(
       Map<String, String> markerData, Environment env, Set<String> keys)
       throws InterruptedException {
+    if (keys.isEmpty()) {
+      return true;
+    }
+
     ImmutableMap<String, String> environ = ActionEnvironmentFunction.getEnvironmentView(env, keys);
     if (env.valuesMissing()) {
       return false; // Returns false so caller knows to return immediately