diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
index f9cb05315b27..e697b0205100 100644
--- a/deps/rabbit/Makefile
+++ b/deps/rabbit/Makefile
@@ -142,8 +142,6 @@ dep_syslog = git https://github.com/schlagert/syslog 4.0.0
 dep_osiris = git https://github.com/rabbitmq/osiris v1.8.1
 dep_systemd = hex 0.6.1
 
-dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
-
 define usage_xml_to_erl
 $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1))))
 endef
diff --git a/deps/rabbit/src/rabbit_mirror_queue_misc.erl b/deps/rabbit/src/rabbit_mirror_queue_misc.erl
index fef5bcc1141e..f0fdac8495b7 100644
--- a/deps/rabbit/src/rabbit_mirror_queue_misc.erl
+++ b/deps/rabbit/src/rabbit_mirror_queue_misc.erl
@@ -1010,7 +1010,9 @@ has_ha_policies(Policies) ->
               does_policy_configure_cmq(KeyList)
       end, Policies).
 
-does_policy_configure_cmq(KeyList) ->
+does_policy_configure_cmq(Map) when is_map(Map) ->
+    is_map_key(<<"ha-mode">>, Map);
+does_policy_configure_cmq(KeyList) when is_list(KeyList) ->
     lists:keymember(<<"ha-mode">>, 1, KeyList).
 
 list_policies_with_classic_queue_mirroring_for_cli() ->
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex
index 6a0ef6fd89bd..f72600ab2008 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/plugins.ex
@@ -2,7 +2,7 @@
 ## License, v. 2.0. If a copy of the MPL was not distributed with this
 ## file, You can obtain one at https://mozilla.org/MPL/2.0/.
 ##
-## Copyright (c) 2007-2023 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.  All rights reserved.
+## Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.  All rights reserved.
 alias RabbitMQ.CLI.Formatters.FormatterHelpers
 
 defmodule RabbitMQ.CLI.Formatters.Plugins do
@@ -146,10 +146,18 @@ defmodule RabbitMQ.CLI.Formatters.Plugins do
     ]
   end
 
+  defp augment_version(%{version: version, running: false}) do
+    to_string(version)
+  end
+
   defp augment_version(%{version: version, running_version: nil}) do
     to_string(version)
   end
 
+  defp augment_version(%{version: version, running_version: ""}) do
+    to_string(version)
+  end
+
   defp augment_version(%{version: version, running_version: version}) do
     to_string(version)
   end
diff --git a/deps/rabbitmq_cli/test/plugins/plugins_formatter_test.exs b/deps/rabbitmq_cli/test/plugins/plugins_formatter_test.exs
index 6b2621479508..eda17b519905 100644
--- a/deps/rabbitmq_cli/test/plugins/plugins_formatter_test.exs
+++ b/deps/rabbitmq_cli/test/plugins/plugins_formatter_test.exs
@@ -76,7 +76,7 @@ defmodule PluginsFormatterTest do
               enabled: :implicit,
               running: true,
               version: ~c"3.7.0",
-              running_version: nil
+              running_version: ""
             },
             %{
               name: :mock_rabbitmq_plugins_01,
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 4b8180f9e72e..f8a796adcdd1 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -129,6 +129,7 @@ dep_recon = hex 2.5.3
 dep_redbug = hex 2.0.7
 dep_thoas = hex 1.0.0
 dep_observer_cli = hex 1.7.3
+dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
 dep_stdout_formatter = hex 0.2.4
 dep_sysmon_handler = hex 1.3.0