diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
index db71d2b5f11..67610f90175 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
@@ -131,8 +131,8 @@ public void unregister()
     {
         this.dispatcher.setWhiteboardManager(null);
 
-        this.httpServiceFactory.stop();
         this.whiteboardManager.stop();
+        this.httpServiceFactory.stop();
 
         this.registry.shutdown();
         this.httpSessionListener = null;