diff --git a/actions/apache b/actions/apache
index 6ebb4fbc3..98aa4903c 100755
--- a/actions/apache
+++ b/actions/apache
@@ -136,6 +136,7 @@ def subcommand_setup(arguments):
         # FreedomBox applications.
         webserver.enable('cgi', kind='module')
         webserver.enable('authnz_ldap', kind='module')
+        webserver.enable('proxy_wstunnel', kind='module')
 
         # enable configuration for PHP-FPM
         webserver.enable('php-fpm-freedombox', kind='config')
diff --git a/actions/cockpit b/actions/cockpit
index 6acb08f3e..d117323cc 100755
--- a/actions/cockpit
+++ b/actions/cockpit
@@ -64,7 +64,6 @@ def subcommand_setup(arguments):
     aug.save()
 
     with action_utils.WebserverChange() as webserver_change:
-        webserver_change.enable('proxy_wstunnel', kind='module')
         webserver_change.enable('cockpit-freedombox')
 
     action_utils.service_restart('cockpit.socket')