diff --git a/php/src/Container/Container.php b/php/src/Container/Container.php
index 1119a4ba..c1330da3 100644
--- a/php/src/Container/Container.php
+++ b/php/src/Container/Container.php
@@ -91,6 +91,10 @@ class Container {
         return $this->dockerActionManager->GetContainerRunningState($this);
     }
 
+    public function GetRestartingState() : IContainerState {
+        return $this->dockerActionManager->GetContainerRestartingState($this);
+    }
+
     public function GetUpdateState() : IContainerState {
         return $this->dockerActionManager->GetContainerUpdateState($this);
     }
diff --git a/php/src/Container/State/NotRestartingState.php b/php/src/Container/State/NotRestartingState.php
new file mode 100644
index 00000000..b035377c
--- /dev/null
+++ b/php/src/Container/State/NotRestartingState.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace AIO\Container\State;
+
+class NotRestartingState implements IContainerState
+{}
\ No newline at end of file
diff --git a/php/src/Container/State/RestartingState.php b/php/src/Container/State/RestartingState.php
new file mode 100644
index 00000000..9e94637e
--- /dev/null
+++ b/php/src/Container/State/RestartingState.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace AIO\Container\State;
+
+class RestartingState implements IContainerState
+{}
\ No newline at end of file
diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
index 28237ec1..92cf9436 100644
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -7,6 +7,8 @@ use AIO\Container\State\IContainerState;
 use AIO\Container\State\ImageDoesNotExistState;
 use AIO\Container\State\StartingState;
 use AIO\Container\State\RunningState;
+use AIO\Container\State\RestartingState;
+use AIO\Container\State\NotRestartingState;
 use AIO\Container\State\VersionDifferentState;
 use AIO\Container\State\StoppedState;
 use AIO\Container\State\VersionEqualState;
@@ -70,6 +72,27 @@ class DockerActionManager
         }
     }
 
+    public function GetContainerRestartingState(Container $container) : IContainerState
+    {
+        $url = $this->BuildApiUrl(sprintf('containers/%s/json', urlencode($container->GetIdentifier())));
+        try {
+            $response = $this->guzzleClient->get($url);
+        } catch (RequestException $e) {
+            if ($e->getCode() === 404) {
+                return new ImageDoesNotExistState();
+            }
+            throw $e;
+        }
+
+        $responseBody = json_decode((string)$response->getBody(), true);
+
+        if ($responseBody['State']['Restarting'] === true) {
+            return new RestartingState();
+        } else {
+            return new NotRestartingState();
+        }
+    }
+
     public function GetContainerUpdateState(Container $container) : IContainerState
     {
         $tag = $this->GetCurrentChannel();
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 6209266e..6d727afa 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -20,6 +20,7 @@
         This is beta software and not production ready.<br><br>
 
         {% set isAnyRunning = false %}
+        {% set isAnyRestarting = false %}
         {% set isWatchtowerRunning = false %}
         {% set isBackupContainerRunning = false %}
         {% set isRestoreRunning = false %}
@@ -30,6 +31,9 @@
             {% if class(container.GetRunningState()) == 'AIO\\Container\\State\\RunningState' and container.GetIdentifier() != 'nextcloud-aio-domaincheck' and container.GetIdentifier() != 'nextcloud-aio-borgbackup' and container.GetIdentifier() != 'nextcloud-aio-watchtower' %}
                 {% set isAnyRunning = true %}
             {% endif %}
+            {% if ( container.GetIdentifier() starts with 'nextcloud-aio-redis' or container.GetIdentifier() starts with 'nextcloud-aio-database' or container.GetIdentifier() starts with 'nextcloud-aio-nextcloud' or container.GetIdentifier() starts with 'nextcloud-aio-apache' ) and class(container.GetRestartingState()) == 'AIO\\Container\\State\\RestartingState' %}
+                {% set isAnyRestarting = true %}
+            {% endif %}
             {% if container.GetIdentifier() == 'nextcloud-aio-watchtower' and class(container.GetRunningState()) == 'AIO\\Container\\State\\RunningState' %}
                 {% set isWatchtowerRunning = true %}
             {% endif %}
@@ -81,8 +85,18 @@
                         Initial Nextcloud password: {{ nextcloud_password }}<br /><br/>
                         <a href="https://{{ domain }}" class="button" target="_blank" rel="noopener">Open your Nextcloud ↗</a><br/>
                     {% else %}
-                        Containers are currently starting.<br /><br />
-                        <a href="" class="button reload">Reload ↻</a><br/>
+                        {% if isAnyRestarting == false %}
+                            Containers are currently starting.<br /><br />
+                            <a href="" class="button reload">Reload ↻</a><br/><br>
+                        {% else %}
+                            It seems like at least one container is currently restarting which means it is not able to start correctly.<br><br>
+                            To break out this endless loop, you can stop the containers below and investigate the issue by having a look at the container logs before starting them again.<br><br>
+                            <form method="POST" action="/api/docker/stop" class="xhr">
+                                <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
+                                <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
+                                <input class="button" type="submit" value="Stop containers" />
+                            </form>
+                        {% endif %}
                     {% endif %}
                 {% endif %}
 
@@ -110,7 +124,7 @@
 
                     {% if has_update_available == true %}
                         {% if is_mastercontainer_update_available == false %}
-                            ⚠ Container updates are available. Click on `Stop Containers` and `Start Containers` to update them. You should consider creating a backup first.<br><br>
+                            ⚠ Container updates are available. Click on 'Stop Containers' and 'Start Containers' to update them. You should consider creating a backup first.<br><br>
                         {% endif %}
                     {% else %}
                         {% if is_mastercontainer_update_available == false %}