diff --git a/tensorboard/uploader/BUILD b/tensorboard/uploader/BUILD
index a2c84cc3b2..bf1b833c83 100644
--- a/tensorboard/uploader/BUILD
+++ b/tensorboard/uploader/BUILD
@@ -76,6 +76,7 @@ py_library(
         "//tensorboard:expect_absl_logging_installed",
         "//tensorboard:expect_grpc_installed",
         "//tensorboard:program",
+        "//tensorboard/compat:tensorflow",
         "//tensorboard/plugins:base_plugin",
         "//tensorboard/uploader/proto:protos_all_py_pb2_grpc",
     ],
diff --git a/tensorboard/uploader/uploader_subcommand.py b/tensorboard/uploader/uploader_subcommand.py
index d580dfc3d7..18eef57309 100644
--- a/tensorboard/uploader/uploader_subcommand.py
+++ b/tensorboard/uploader/uploader_subcommand.py
@@ -23,6 +23,7 @@
 
 from absl import logging
 import grpc
+from tensorboard.compat import tf
 
 from tensorboard.uploader.proto import experiment_pb2
 from tensorboard.uploader.proto import export_service_pb2_grpc
@@ -414,7 +415,7 @@ def execute(self, server_info, channel):
             verbosity=self.verbosity,
             one_shot=self.one_shot,
         )
-        if self.one_shot and not os.path.isdir(self.logdir):
+        if self.one_shot and not tf.io.gfile.isdir(self.logdir):
             print("%s: No such directory." % self.logdir)
             print(
                 "User specified `one_shot` mode with an unavailable "