diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/enable_feature_flag_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/enable_feature_flag_command.ex
index fe7868145d1d..51f7f56fc7a3 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/enable_feature_flag_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/enable_feature_flag_command.ex
@@ -8,7 +8,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
   @behaviour RabbitMQ.CLI.CommandBehaviour
 
   def switches(), do: [experimental: :boolean]
-  def aliases(), do: [f: :experimental]
+  def aliases(), do: [e: :experimental]
 
   def merge_defaults(args, opts), do: { args, Map.merge(%{experimental: false}, opts) }
 
@@ -24,9 +24,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
 
   def run(["all"], %{node: node_name}) do
     case :rabbit_misc.rpc_call(node_name, :rabbit_feature_flags, :enable_all, []) do
-      # Server does not support feature flags, consider none are available.
-      # See rabbitmq/rabbitmq-cli#344 for context. MK.
-      {:badrpc, {:EXIT, {:undef, _}}} -> {:error, :unsupported}
       {:badrpc, _} = err -> err
       other -> other
     end
@@ -36,7 +33,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
     case {experimental, :rabbit_misc.rpc_call(node_name, :rabbit_feature_flags, :get_stability, [
       String.to_atom(feature_flag)
     ])} do
-          {_, {:badrpc, {:EXIT, {:undef, _}}}} -> {:error, :unsupported}
           {_, {:badrpc, _} = err} -> err
           {false, :experimental} ->
               IO.puts("Feature flag #{feature_flag} is experimental. If you understand the risk, use --experimental to enable it.")
@@ -44,9 +40,6 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
                 case :rabbit_misc.rpc_call(node_name, :rabbit_feature_flags, :enable, [
                   String.to_atom(feature_flag)
                 ]) do
-                  # Server does not support feature flags, consider none are available.
-                  # See rabbitmq/rabbitmq-cli#344 for context. MK.
-                  {:badrpc, {:EXIT, {:undef, _}}} -> {:error, :unsupported}
                   {:badrpc, _} = err -> err
                   other -> other
                 end
@@ -70,7 +63,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.EnableFeatureFlagCommand do
       ],
       [
         "--experimental",
-        "required to enable experimental feature flags (make sure you understand the risks!))"
+        "required to enable experimental feature flags (make sure you understand the risks!)"
       ]
     ]
   end
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/feature-flags.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/feature-flags.ejs
index e4f0188ec07f..03f036f06d43 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/feature-flags.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/feature-flags.ejs
@@ -87,7 +87,7 @@
   <div class="hider">
 <% if (feature_flags.length > 0) { %>
 <p class="warning">
-  Feature flags listed below are experimental. They should not be enabled in a produciton deployment.
+  Feature flags listed below are experimental. They should not be enabled in a production deployment.
 </p>
 <table class="list">
   <thead>