diff --git a/core/scripts/normalsub/normalsub.sh b/core/scripts/normalsub/normalsub.sh
index 635e76d..e0c447f 100644
--- a/core/scripts/normalsub/normalsub.sh
+++ b/core/scripts/normalsub/normalsub.sh
@@ -54,7 +54,7 @@ start_service() {
     fi
 
     # install_dependencies
-    systemctl stop caddy.service > /dev/null 2>&1
+    # systemctl stop caddy.service > /dev/null 2>&1 # We stopped caddy service just after its installation
 
     echo "Generating SSL certificates for $domain..."
     certbot certonly --standalone --agree-tos --register-unsafely-without-email -d "$domain"
@@ -70,7 +70,7 @@ start_service() {
     systemctl daemon-reload
     systemctl enable hysteria-normal-sub.service > /dev/null 2>&1
     systemctl start hysteria-normal-sub.service > /dev/null 2>&1
-    systemctl restart caddy.service > /dev/null 2>&1
+    # systemctl restart caddy.service > /dev/null 2>&1 # We stopped caddy service just after its installation
     systemctl daemon-reload > /dev/null 2>&1
 
     if systemctl is-active --quiet hysteria-normal-sub.service; then
diff --git a/core/scripts/singbox/singbox_shell.sh b/core/scripts/singbox/singbox_shell.sh
index 4351ffe..9f0d16c 100644
--- a/core/scripts/singbox/singbox_shell.sh
+++ b/core/scripts/singbox/singbox_shell.sh
@@ -54,7 +54,7 @@ start_service() {
     fi
 
     # install_dependencies
-    systemctl stop caddy.service > /dev/null 2>&1
+    # systemctl stop caddy.service > /dev/null 2>&1 # We stopped caddy service just after its installation
 
     echo "Generating SSL certificates for $domain..."
     certbot certonly --standalone --agree-tos --register-unsafely-without-email -d "$domain"
@@ -74,7 +74,7 @@ start_service() {
     systemctl daemon-reload
     systemctl enable hysteria-singbox.service > /dev/null 2>&1
     systemctl start hysteria-singbox.service > /dev/null 2>&1
-    systemctl restart caddy.service > /dev/null 2>&1
+    # systemctl restart caddy.service > /dev/null 2>&1 # We stopped caddy service just after its installation
     systemctl daemon-reload > /dev/null 2>&1
 
     if systemctl is-active --quiet hysteria-singbox.service; then
diff --git a/core/scripts/webpanel/webpanel_shell.sh b/core/scripts/webpanel/webpanel_shell.sh
index bb8fb3e..0a768de 100644
--- a/core/scripts/webpanel/webpanel_shell.sh
+++ b/core/scripts/webpanel/webpanel_shell.sh
@@ -27,6 +27,10 @@ install_dependencies() {
         exit 1
     fi
 
+    # Stop and disable Caddy service
+    systemctl stop caddy > /dev/null 2>&1
+    systemctl disable caddy > /dev/null 2>&1
+
     echo -e "${green}Caddy installed successfully. ${NC}"
 }
 update_env_file() {