diff --git a/roles/custom/matrix-bot-draupnir/defaults/main.yml b/roles/custom/matrix-bot-draupnir/defaults/main.yml
index 0757dc83f..83dfb7c2b 100644
--- a/roles/custom/matrix-bot-draupnir/defaults/main.yml
+++ b/roles/custom/matrix-bot-draupnir/defaults/main.yml
@@ -117,11 +117,11 @@ matrix_bot_draupnir_config_rawHomeserverUrl: ""  # noqa var-naming
 # It is exposed here because it is common enough to be valid to expose.
 matrix_bot_draupnir_config_disableServerACL: false  # noqa var-naming
 
-# Used to control if the Synapse Admin API is exposed internally to the containers and therefore giving Draupnir Access.
-matrix_bot_draupnir_admin_api_enabled: false
+# Control if Draupnir wants for the Synapse Admin API to be exposed internally to containers, therefore giving Draupnir Access.
+matrix_bot_draupnir_admin_api_enabled: "{{ matrix_bot_draupnir_config_admin_enableMakeRoomAdminCommand }}"
 
-# Controls if the draupnir room hijack command is activated or not. This also automatically enables the internal admin API
-# in the process of activation.
+# Controls if the Draupnir room hijack command is activated or not.
+# Also see `matrix_bot_draupnir_admin_api_enabled`.
 matrix_bot_draupnir_config_admin_enableMakeRoomAdminCommand: false  # noqa var-naming
 
 # Controls if the room state backing store is activated.