diff --git a/tensorflow_model_analysis/eval_saved_model/export.py b/tensorflow_model_analysis/eval_saved_model/export.py
index 81f012b4ef..efd3d89b9e 100644
--- a/tensorflow_model_analysis/eval_saved_model/export.py
+++ b/tensorflow_model_analysis/eval_saved_model/export.py
@@ -456,7 +456,8 @@ def export_eval_savedmodel(
     ValueError: Could not find a checkpoint to export.
   """
   # TODO(b/110472071): Temporary for tf.contrib.learn Estimator support only.
-  if isinstance(estimator, tf.contrib.learn.Estimator):
+  if isinstance(estimator, tf.contrib.learn.Estimator) and\
+        not hasattr(estimator, 'experimental_export_all_saved_models'):
     return _export_eval_savedmodel_contrib_estimator(
         estimator=estimator,
         export_dir_base=export_dir_base,