diff --git a/plinth/__main__.py b/plinth/__main__.py
index 81d7695bf..6b22f42d1 100644
--- a/plinth/__main__.py
+++ b/plinth/__main__.py
@@ -328,6 +328,8 @@ def main():
     logger.info('Configuration loaded from file - %s', cfg.config_file)
     logger.info('Script prefix - %s', cfg.server_dir)
 
+    module_loader.include_urls()
+
     module_loader.load_modules()
     if arguments.setup is not False:
         run_setup_and_exit(arguments.setup)
@@ -349,5 +351,6 @@ def main():
     cherrypy.engine.start()
     cherrypy.engine.block()
 
+
 if __name__ == '__main__':
     main()
diff --git a/plinth/module_loader.py b/plinth/module_loader.py
index 6fae7beec..4feb5fe87 100644
--- a/plinth/module_loader.py
+++ b/plinth/module_loader.py
@@ -37,6 +37,13 @@ loaded_modules = collections.OrderedDict()
 _modules_to_load = None
 
 
+def include_urls():
+    """Include the URLs of the modules into main Django project."""
+    for module_import_path in get_modules_to_load():
+        module_name = module_import_path.split('.')[-1]
+        _include_module_urls(module_import_path, module_name)
+
+
 def load_modules():
     """
     Read names of enabled modules in modules/enabled directory and
@@ -55,8 +62,6 @@ def load_modules():
             if cfg.debug:
                 raise
 
-        _include_module_urls(module_import_path, module_name)
-
     ordered_modules = []
     remaining_modules = dict(modules)  # Make a copy
     for module_name in modules: