diff --git a/app/Livewire/Project/Shared/GetLogs.php b/app/Livewire/Project/Shared/GetLogs.php
index 16cabfd6b..f57563330 100644
--- a/app/Livewire/Project/Shared/GetLogs.php
+++ b/app/Livewire/Project/Shared/GetLogs.php
@@ -122,7 +122,7 @@ class GetLogs extends Component
         if (! $this->server->isFunctional()) {
             return;
         }
-        if (! $refresh && ($this->resource?->getMorphClass() === \App\Models\Service::class || str($this->container)->contains('-pr-'))) {
+        if (! $refresh && ! $this->expandByDefault && ($this->resource?->getMorphClass() === \App\Models\Service::class || str($this->container)->contains('-pr-'))) {
             return;
         }
         if ($this->numberOfLines <= 0 || is_null($this->numberOfLines)) {
diff --git a/resources/views/livewire/project/shared/get-logs.blade.php b/resources/views/livewire/project/shared/get-logs.blade.php
index f031690a5..e34e57de8 100644
--- a/resources/views/livewire/project/shared/get-logs.blade.php
+++ b/resources/views/livewire/project/shared/get-logs.blade.php
@@ -2,7 +2,7 @@
     <div id="screen" x-data="{
         collapsible: {{ $collapsible ? 'true' : 'false' }},
         expanded: {{ ($expandByDefault || !$collapsible) ? 'true' : 'false' }},
-        logsLoaded: {{ ($expandByDefault || !$collapsible) ? 'true' : 'false' }},
+        logsLoaded: false,
         fullscreen: false,
         alwaysScroll: false,
         intervalId: null,
@@ -156,7 +156,10 @@
             URL.revokeObjectURL(url);
         },
         init() {
-            if (this.expanded) { this.$wire.getLogs(); }
+            if (this.expanded) {
+                this.$wire.getLogs();
+                this.logsLoaded = true;
+            }
             // Re-render logs after Livewire updates
             Livewire.hook('commit', ({ succeed }) => {
                 succeed(() => {