diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh
index aa3fea26..81d0c697 100644
--- a/Containers/nextcloud/entrypoint.sh
+++ b/Containers/nextcloud/entrypoint.sh
@@ -472,10 +472,16 @@ fi
 
 # Clamav
 if [ "$CLAMAV_ENABLED" = 'yes' ]; then
-    while ! nc -z "$CLAMAV_HOST" 3310; do
+    CLAMAV_COUNT=0
+    while ! nc -z "$CLAMAV_HOST" 3310 && [ "$CLAMAV_COUNT" -lt 90 ]; do
         echo "waiting for clamav to become available..."
+        CLAMAV_COUNT=$((CLAMAV_COUNT + 5))
         sleep 5
     done
+    if [ "$CLAMAV_COUNT" -ge 90 ]; then
+        echo "Error: ClamAV was not reachable within 90s. Most likely is your RAM not big enough to let it start correctly."
+        exit 1
+    fi
     if ! [ -d "/var/www/html/custom_apps/files_antivirus" ]; then
         php /var/www/html/occ app:install files_antivirus
     elif [ "$(php /var/www/html/occ config:app:get files_antivirus enabled)" = "no" ]; then
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index c31d2f1b..0f642d33 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -562,7 +562,7 @@
             {% endif %}
         {% endif %}
 
-    {% if isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true or is_daily_backup_running == true %}
+    {% if isAnyRestarting == false and (isApacheStarting == true or is_backup_container_running == true or isWatchtowerRunning == true or is_daily_backup_running == true) %}
         <script type="text/javascript" src="automatic_reload.js"></script>
     {% else %}
         <script type="text/javascript" src="before-unload.js"></script>