diff --git a/tensorboard/uploader/flags_parser.py b/tensorboard/uploader/flags_parser.py
index 035e7382da..d95fcacadc 100644
--- a/tensorboard/uploader/flags_parser.py
+++ b/tensorboard/uploader/flags_parser.py
@@ -118,8 +118,7 @@ def define_flags(parser):
     )
     upload.add_argument(
         "--plugins",
-        type=str,
-        nargs="*",
+        type=lambda option: option.split(","),
         default=[],
         help="List of plugins for which data should be uploaded. If "
         "unspecified then data will be uploaded for all plugins supported by "
diff --git a/tensorboard/uploader/flags_parser_test.py b/tensorboard/uploader/flags_parser_test.py
index 20dec6bc30..81b0f72857 100644
--- a/tensorboard/uploader/flags_parser_test.py
+++ b/tensorboard/uploader/flags_parser_test.py
@@ -48,7 +48,7 @@ def test_upload_logdir(self):
 
     def test_upload_with_plugins(self):
         flags = flags_parser.parse_flags(
-            ["uploader", "upload", "--plugins", "plugin1", "plugin2"]
+            ["uploader", "upload", "--plugins", "plugin1,plugin2"]
         )
         self.assertEqual(
             flags_parser.SUBCOMMAND_KEY_UPLOAD,