diff --git a/openlp/core/api/http/endpoint/__init__.py b/openlp/core/api/http/endpoint/__init__.py
index aa5ee175e..0fa61031f 100644
--- a/openlp/core/api/http/endpoint/__init__.py
+++ b/openlp/core/api/http/endpoint/__init__.py
@@ -53,3 +53,6 @@ class Endpoint(object):
             self.add_url_route(rule, func, method, secure)
             return func
         return decorator
+
+from .controller import controller_endpoint
+from .core import stage_endpoint
\ No newline at end of file
diff --git a/openlp/core/api/http/endpoint/controller.py b/openlp/core/api/http/endpoint/controller.py
index 9260129d8..aff6a260d 100644
--- a/openlp/core/api/http/endpoint/controller.py
+++ b/openlp/core/api/http/endpoint/controller.py
@@ -24,7 +24,8 @@ import os
 import urllib.request
 import urllib.error
 
-from openlp.core.api import Endpoint, register_endpoint
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import register_endpoint
 from openlp.core.common import Registry, AppLocation, Settings
 from openlp.core.lib import ItemCapabilities, create_thumb
 
diff --git a/openlp/core/api/http/endpoint/core.py b/openlp/core/api/http/endpoint/core.py
index 7f20c11a7..ab90dcfb9 100644
--- a/openlp/core/api/http/endpoint/core.py
+++ b/openlp/core/api/http/endpoint/core.py
@@ -1,7 +1,8 @@
 import logging
 import os
 
-from openlp.core.api import Endpoint, register_endpoint
+from openlp.core.api.http.endpoint import Endpoint
+from openlp.core.api.http import register_endpoint
 from openlp.core.common import AppLocation, UiStrings, translate