diff --git a/tensorflow/core/common_runtime/eager/kernel_and_device.cc b/tensorflow/core/common_runtime/eager/kernel_and_device.cc
index e0e87c36f03..a022b6defbc 100644
--- a/tensorflow/core/common_runtime/eager/kernel_and_device.cc
+++ b/tensorflow/core/common_runtime/eager/kernel_and_device.cc
@@ -308,12 +308,7 @@ Status KernelAndDeviceOp::Run(
   if (outputs != nullptr) {
     outputs->clear();
     for (int i = 0; i < context.num_outputs(); ++i) {
-      const auto* output_tensor = context.mutable_output(i);
-      if (output_tensor != nullptr) {
-        outputs->push_back(Tensor(*output_tensor));
-      } else {
-        outputs->push_back(Tensor());
-      }
+      outputs->push_back(Tensor(*context.mutable_output(i)));
     }
   }
   return Status::OK();
diff --git a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
index 68ddbe12f16..2e13414f720 100644
--- a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
+++ b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
@@ -4579,14 +4579,6 @@ class ControlFlowTest(test.TestCase, parameterized.TestCase):
       result = control_flow_ops.merge([v_f, v_t])
       self.evaluate(result)
 
-  def testSwitchEagerMode(self):
-    if not context.executing_eagerly():
-      return
-    input_data = [1, 2, 3, 4]
-    vf, vt = control_flow_ops.switch(input_data, False)
-    self.assertAllEqual(vf, input_data)
-    self.assertAllEqual(vt, [])
-
   @test_util.run_deprecated_v1
   def testQIntArgAndRet(self):