diff --git a/planemo/commands/cmd_serve.py b/planemo/commands/cmd_serve.py
index 5711a8c6b..b590b6bf4 100644
--- a/planemo/commands/cmd_serve.py
+++ b/planemo/commands/cmd_serve.py
@@ -40,6 +40,5 @@ def cli(ctx, uris, **kwds):
     """
     paths = uris_to_paths(ctx, uris)
     runnables = for_paths(paths)
-    kwds["galaxy_skip_client_build"] = kwds.pop("skip_client_build", False)
     with galaxy_serve(ctx, runnables, **kwds):
         pass
diff --git a/planemo/commands/cmd_shed_serve.py b/planemo/commands/cmd_shed_serve.py
index 21d806cf1..5a0dead3f 100644
--- a/planemo/commands/cmd_shed_serve.py
+++ b/planemo/commands/cmd_shed_serve.py
@@ -29,7 +29,6 @@ def cli(ctx, paths, **kwds):
     install these artifacts, and serve a Galaxy instances that can be
     logged into and explored interactively.
     """
-    kwds["galaxy_skip_client_build"] = kwds.pop("skip_client_build", False)
     install_args_list = kwds["install_args_list"] = shed.install_arg_lists(ctx, paths, **kwds)
     runnables = install_args_list_to_runnables(ctx, install_args_list, kwds)
     with engine_context(ctx, **kwds) as engine:
diff --git a/planemo/options.py b/planemo/options.py
index c17069787..da8a4ca90 100644
--- a/planemo/options.py
+++ b/planemo/options.py
@@ -36,7 +36,7 @@ def skip_venv_option():
 def skip_client_build_option():
     """Annotate click command as consume the --skip_client_build option."""
     return planemo_option(
-        "--skip_client_build", is_flag=True, default=False, help=("Do not build Galaxy client when serving Galaxy.")
+        "--skip_client_build", dest="galaxy_skip_client_build", is_flag=True, default=False, help=("Do not build Galaxy client when serving Galaxy.")
     )