diff --git a/nextcloud/root/etc/cont-init.d/30-keygen b/nextcloud/root/etc/cont-init.d/30-keygen
index 3b61e4745..c1a4f8b4b 100644
--- a/nextcloud/root/etc/cont-init.d/30-keygen
+++ b/nextcloud/root/etc/cont-init.d/30-keygen
@@ -8,8 +8,8 @@ if bashio::config.true 'use_own_certs'; then
 
   #Check if files exist
   echo "... checking if referenced files exist"
-  [ ! -f /ssl/$CERTFILE ] && bashio::log.fatal "... Certificate /ssl/$CERTFILE not found" && exit 0
-  [ ! -f /ssl/$KEYFILE ] && bashio::log.fatal "... Certificate /ssl/$KEYFILE not found" && exit 0
+  [ ! -f /ssl/$CERTFILE ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$CERTFILE not found" && bashio::addon.stop
+  [ ! -f /ssl/$KEYFILE ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$KEYFILE not found" && bashio::addon.stop
 
 else
   bashio::log.info "No ssl certificates set. Auto generating ones..."