diff --git a/src/web/mod_http_bind.erl b/src/web/mod_http_bind.erl
index 32d702eb0..a8b47019c 100644
--- a/src/web/mod_http_bind.erl
+++ b/src/web/mod_http_bind.erl
@@ -120,7 +120,7 @@ start(_Host, _Opts) ->
             % mod_http_bind is already started so it will not be started again
             ok;
         {error, Error} ->
-            {'EXIT', {start_child_error, Error}}
+            exit({start_child_error, Error})
     end.
 
 stop(_Host) ->
@@ -128,7 +128,13 @@ stop(_Host) ->
         ok ->
             ok;
         {error, Error} ->
-            {'EXIT', {terminate_child_error, Error}}
+            exit({terminate_child_error, Error})
+    end,
+    case supervisor:delete_child(ejabberd_sup, ejabberd_http_bind_sup) of
+        ok ->
+            ok;
+        {error, Error2} ->
+            exit({delete_child_error, Error2})
     end.
 
 setup_database() ->