diff --git a/bundles/org.openhab.ui.start/src/main/java/org/openhab/ui/start/internal/RootServlet.java b/bundles/org.openhab.ui.start/src/main/java/org/openhab/ui/start/internal/RootServlet.java
index d2d2254be..5daee49dc 100644
--- a/bundles/org.openhab.ui.start/src/main/java/org/openhab/ui/start/internal/RootServlet.java
+++ b/bundles/org.openhab.ui.start/src/main/java/org/openhab/ui/start/internal/RootServlet.java
@@ -19,12 +19,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ResourceHandler;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.openhab.ui.dashboard.DashboardReady;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.framework.SynchronousBundleListener;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.ComponentException;
@@ -73,6 +75,7 @@ public class RootServlet extends DefaultServlet {
 
     private DashboardReady dashboardStarted;
     private LifeCycleState lifecycleState = LifeCycleState.STARTING;
+    private ServiceRegistration handlerRef;
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -126,11 +129,11 @@ public class RootServlet extends DefaultServlet {
         staticContent.setHandler(handler);
         Dictionary props = new Hashtable();
         props.put("contextPath", STATIC_CONTENT_URL);
-        context.getBundleContext().registerService(ContextHandler.class.getName(), staticContent, props);
+        handlerRef = context.getBundleContext().registerService(Handler.class.getName(), staticContent, props);
 
         // register servlet
         try {
-            httpService.registerServlet("/", this, new Properties(), httpService.createDefaultHttpContext());
+            httpService.registerServlet("/", this, new Properties(), null);
         } catch (ServletException | NamespaceException e) {
             logger.error("Failed registering root servlet!", e);
         }
@@ -168,7 +171,13 @@ public class RootServlet extends DefaultServlet {
     }
 
     @Deactivate
-    protected void deactivate() {
+    protected void deactivate(ComponentContext context) {
+        httpService.unregister("/");
+        if (handlerRef != null) {
+            handlerRef.unregister();
+            handlerRef = null;
+        }
+
         // reset, if this component is ever reused (should normally not be the case), it should be "starting" again.
         lifecycleState = LifeCycleState.STARTING;
     }
diff --git a/features/openhab-core/src/main/feature/feature.xml b/features/openhab-core/src/main/feature/feature.xml
index 414cff959..bb57fb359 100644
--- a/features/openhab-core/src/main/feature/feature.xml
+++ b/features/openhab-core/src/main/feature/feature.xml
@@ -33,7 +33,8 @@
         <feature prerequisite="true">shell</feature>
         <feature prerequisite="true">wrapper</feature>
         <!-- This bundle needs to be started early as it registers the 404 and startup pages on Jetty -->
-        <bundle start-level="30">mvn:org.openhab.core/org.openhab.ui.start/${project.version}</bundle>
+        <!-- It is temperarily disabled due to https://github.com/openhab/openhab-core/issues/422
+        <bundle start-level="30">mvn:org.openhab.core/org.openhab.ui.start/${project.version}</bundle> -->
         <bundle start-level="90">mvn:org.openhab.core/org.openhab.core/${project.version}</bundle>
         <bundle>mvn:org.openhab.core/org.openhab.core.karaf/${project.version}</bundle>
         <bundle>mvn:org.openhab.core/org.openhab.io.sound/${project.version}</bundle>