diff --git a/resources/docker/entrypoint.sh b/resources/docker/entrypoint.sh
index 8e35c9b05..d962583e5 100644
--- a/resources/docker/entrypoint.sh
+++ b/resources/docker/entrypoint.sh
@@ -2,7 +2,7 @@
 # shellcheck shell=dash
 
 # If the configuration file does not exist wait until it does.
-while [ ! -f /opt/stalwart-mail/etc/config.toml ]; do
+while [ ! -f /opt/stalwart-mail/etc/config.toml ] || grep -q "__CERT_PATH__" /opt/stalwart-mail/etc/common/tls.toml; do
     sleep 1
 done