diff --git a/php/src/Controller/DockerController.php b/php/src/Controller/DockerController.php
index 7de6c1dd..c054311e 100644
--- a/php/src/Controller/DockerController.php
+++ b/php/src/Controller/DockerController.php
@@ -44,8 +44,12 @@ class DockerController
     public function GetLogs(Request $request, Response $response, $args) : Response
     {
         $id = $request->getQueryParams()['id'];
-        $container = $this->containerDefinitionFetcher->GetContainerById($id);
-        $logs = $this->dockerActionManager->GetLogs($container);
+        if (str_starts_with($id, 'nextcloud-aio-')) {
+            $logs = $this->dockerActionManager->GetLogs($id);
+        } else {
+            $logs = 'Container not found.';
+        }
+
         $body = $response->getBody();
         $body->write($logs);
 
diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
index 455d2999..df23da3f 100644
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -120,12 +120,12 @@ class DockerActionManager
         }
     }
 
-    public function GetLogs(Container $container) : string
+    public function GetLogs(string $id) : string
     {
         $url = $this->BuildApiUrl(
             sprintf(
                 'containers/%s/logs?stdout=true&stderr=true',
-                urlencode($container->GetIdentifier())
+                urlencode($id)
             ));
         $responseBody = (string)$this->guzzleClient->get($url)->getBody();
 
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 353e7d1f..679b8d0c 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -164,7 +164,7 @@
                     
                     {% if isBackupOrRestoreRunning == false %}
                         <h2>Mastercontainer</h2>
-                        You are currently running the {{ current_channel }} channel.<br><br>
+                        You are currently running the {{ current_channel }} channel. (<a href="/api/docker/logs?id=nextcloud-aio-mastercontainer">Logs</a>)<br><br>
 
                         {% if is_mastercontainer_update_available == true %}
                             {% if isAnyRunning == false %}