diff --git a/tensorflow/core/kernels/cwise_op_gpu_tan.cu.cc b/tensorflow/core/kernels/cwise_op_gpu_tan.cu.cc
index 532a8cc26da..1e134acdedb 100644
--- a/tensorflow/core/kernels/cwise_op_gpu_tan.cu.cc
+++ b/tensorflow/core/kernels/cwise_op_gpu_tan.cu.cc
@@ -19,7 +19,9 @@ limitations under the License.
 
 namespace tensorflow {
 namespace functor {
+#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED)
 DEFINE_UNARY3(tan, Eigen::half, float, double);
+#endif
 }  // namespace functor
 }  // namespace tensorflow
 
diff --git a/tensorflow/core/kernels/cwise_op_tan.cc b/tensorflow/core/kernels/cwise_op_tan.cc
index fdde4c8600d..5eca6c53efd 100644
--- a/tensorflow/core/kernels/cwise_op_tan.cc
+++ b/tensorflow/core/kernels/cwise_op_tan.cc
@@ -20,8 +20,7 @@ REGISTER6(UnaryOp, CPU, "Tan", functor::tan, Eigen::half, bfloat16, float,
           double, complex64, complex128);
 
 #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
-#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED) || \
-    !defined(MLIR_GENERATED_EXPERIMENTAL_GPU_KERNELS_ENABLED)
+#if !defined(MLIR_GENERATED_GPU_KERNELS_ENABLED)
 REGISTER3(UnaryOp, GPU, "Tan", functor::tan, Eigen::half, float, double);
 #endif
 #endif
diff --git a/tensorflow/core/kernels/mlir_generated/BUILD b/tensorflow/core/kernels/mlir_generated/BUILD
index f561b1c8210..9c627e93764 100644
--- a/tensorflow/core/kernels/mlir_generated/BUILD
+++ b/tensorflow/core/kernels/mlir_generated/BUILD
@@ -41,6 +41,7 @@ filegroup(
         "gpu_op_abs.cc",
         "gpu_op_atan.cc",
         "gpu_op_atanh.cc",
+        "gpu_op_tan.cc",
         "gpu_op_tanh.cc",
     ],
     compatible_with = get_compatible_with_cloud(),
@@ -80,7 +81,6 @@ filegroup(
         "gpu_op_sinh.cc",
         "gpu_op_sqrt.cc",
         "gpu_op_square.cc",
-        "gpu_op_tan.cc",
     ],
     compatible_with = get_compatible_with_cloud(),
 )