diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java
index f14795df55a..ad11e63c7c8 100644
--- a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java
+++ b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerOperationBuilder.java
@@ -90,8 +90,8 @@ public EagerOperationBuilder addInputList(Output<?>[] inputs) {
 
   @Override
   public OperationBuilder addControlInput(Operation control) {
-    throw new UnsupportedOperationException(
-        "Control inputs are not supported in an eager execution environment");
+    // No-op.  Any operations passed to this method will already be evaluated (b/c eager evaluation).
+    return this;
   }
 
   @Override
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java
index 6802ead9592..b6a5a50a7a4 100644
--- a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java
+++ b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/EagerOperationBuilderTest.java
@@ -61,12 +61,7 @@ public void addInputs() {
               .addInput(tf.constant(true).asOutput())
               .addInputList(new Output<?>[] {tf.constant(-1).asOutput()})
               .build();
-      try {
-        opBuilder(session, "Const", "var").addControlInput(asrt);
-        fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
+      opBuilder(session, "Const", "var").addControlInput(asrt);
     }
   }