diff --git a/src-ui/src/app/components/admin/logs/logs.component.html b/src-ui/src/app/components/admin/logs/logs.component.html
index 649fd62ac..2df9afc7a 100644
--- a/src-ui/src/app/components/admin/logs/logs.component.html
+++ b/src-ui/src/app/components/admin/logs/logs.component.html
@@ -41,21 +41,15 @@
   }
 </ul>
 
-<cdk-virtual-scroll-viewport
-  autosize
-  [minBufferPx]="200"
-  [maxBufferPx]="600"
-  class="bg-dark p-3 text-light font-monospace log-container"
-  #logContainer>
+<cdk-virtual-scroll-viewport autosize class="bg-dark text-light font-monospace log-container" #logContainer>
   @if (loading && !logFiles.length) {
     <div>
       <div class="spinner-border spinner-border-sm me-2" role="status"></div>
       <ng-container i18n>Loading...</ng-container>
     </div>
+  } @else {
+    <div class="p-3">
+      <p *cdkVirtualFor="let log of logs" class="m-0 p-0" [ngClass]="'log-entry-' + log.level">{{log.message}}</p>
+    </div>
   }
-  <p *cdkVirtualFor="let log of logs"
-     class="m-0 p-0"
-     [ngClass]="'log-entry-' + log.level">
-    {{log.message}}
-  </p>
 </cdk-virtual-scroll-viewport>
diff --git a/src-ui/src/app/components/admin/logs/logs.component.ts b/src-ui/src/app/components/admin/logs/logs.component.ts
index 1accfeb87..47f837490 100644
--- a/src-ui/src/app/components/admin/logs/logs.component.ts
+++ b/src-ui/src/app/components/admin/logs/logs.component.ts
@@ -110,7 +110,6 @@ export class LogsComponent
             })
           if (hasChanges) {
             this.logs = parsed
-            this.logContainer?.checkViewportSize()
             this.scrollToBottom()
           }
         },
@@ -146,6 +145,9 @@ export class LogsComponent
 
   scrollToBottom(): void {
     this.changedetectorRef.detectChanges()
-    this.logContainer?.scrollTo({ bottom: 0 })
+    setTimeout(() => {
+      this.logContainer?.checkViewportSize()
+      this.logContainer?.scrollTo({ bottom: 0 })
+    }, 50)
   }
 }