diff --git a/actions/deluge b/actions/deluge
index 3def71a7f..603e831c5 100755
--- a/actions/deluge
+++ b/actions/deluge
@@ -55,9 +55,6 @@ def parse_arguments():
     parser = argparse.ArgumentParser()
     subparsers = parser.add_subparsers(dest='subcommand', help='Sub command')
 
-    # Setup deluge-web
-    subparsers.add_parser('setup', help='Perform first time setup operations.')
-
     # Get whether deluge-web site is enabled
     subparsers.add_parser('get-enabled',
                           help='Get whether deluge-web site is enabled')
@@ -75,12 +72,6 @@ def parse_arguments():
     return parser.parse_args()
 
 
-def subcommand_setup(_):
-    """Perform first time setup operations."""
-    setup()
-    enable()
-
-
 def subcommand_get_enabled(_):
     """Get whether deluge-web site is enabled."""
     if os.path.isfile(APACHE_CONF_ENABLED_PATH) and \
@@ -92,6 +83,7 @@ def subcommand_get_enabled(_):
 
 def subcommand_enable(_):
     """Enable deluge-web site and start deluge-web."""
+    setup()
     enable()
 
 
diff --git a/plinth/modules/deluge/views.py b/plinth/modules/deluge/views.py
index 8dc937523..6ef151d08 100644
--- a/plinth/modules/deluge/views.py
+++ b/plinth/modules/deluge/views.py
@@ -30,13 +30,8 @@ from plinth import package
 from plinth.modules import deluge
 
 
-def on_install():
-    """Setup deluge-web on install."""
-    actions.superuser_run('deluge', ['setup'])
-
-
 @login_required
-@package.required(['deluged', 'deluge-web'], on_install=on_install)
+@package.required(['deluged', 'deluge-web'])
 def index(request):
     """Serve configuration page."""
     status = get_status()