diff --git a/dashboard/src/views/EmailEventlogView.vue b/dashboard/src/views/EmailEventlogView.vue
index 62d3b4045..172e7d383 100644
--- a/dashboard/src/views/EmailEventlogView.vue
+++ b/dashboard/src/views/EmailEventlogView.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, reactive, onMounted, watch } from 'vue';
+import { ref, reactive, onMounted, watch, useTemplateRef } from 'vue';
 import { Button, TextInput, MultiSelect } from '@cloudron/pankow';
 import { useDebouncedRef, prettyEmailAddresses, prettyLongDate } from '@cloudron/pankow/utils';
 import MailModel from '../models/MailModel.js';
@@ -23,8 +23,9 @@ const refreshBusy = ref(false);
 const eventlogs = ref([]);
 const search = useDebouncedRef('');
 const page = ref(1);
-const perPage = ref(20);
+const perPage = ref(10);
 const types = reactive([]);
+const eventlogContainer = useTemplateRef('eventlogContainer');
 
 async function onRefresh() {
   refreshBusy.value = true;
@@ -37,15 +38,17 @@ async function onRefresh() {
   refreshBusy.value = false;
 }
 
+async function fetchMore() {
+  page.value++;
+
+  const [error, result] = await mailModel.eventlog(types.join(','), search.value, page.value, perPage.value);
+  if (error) return console.error(error);
+
+  eventlogs.value = eventlogs.value.concat(result);
+}
+
 async function onScroll(event) {
-  if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
-    page.value++;
-
-    const [error, result] = await mailModel.eventlog(types.join(','), search.value, page.value, perPage.value);
-    if (error) return console.error(error);
-
-    eventlogs.value = eventlogs.value.concat(result);
-  }
+  if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) await fetchMore();
 }
 
 watch(perPage, onRefresh);
@@ -54,6 +57,10 @@ watch(search, onRefresh);
 
 onMounted(async () => {
   await onRefresh();
+
+  while (eventlogContainer.value.scrollHeight <= eventlogContainer.value.offsetHeight) {
+    await fetchMore();
+  }
 });
 
 </script>
@@ -72,7 +79,7 @@ onMounted(async () => {
           <Button tool secondary href="/logs.html?id=mail" target="_blank">{{ $t('main.action.logs') }}</Button>
         </div>
       </h2>
-      <div class="section-body" style="margin-top: 16px; overflow: auto; padding-top: 0" @scroll="onScroll">
+      <div class="section-body" ref="eventlogContainer" style="margin-top: 16px; overflow: auto; padding-top: 0" @scroll="onScroll">
         <table class="eventlog-table">
           <thead>
             <tr>
diff --git a/dashboard/src/views/EventlogView.vue b/dashboard/src/views/EventlogView.vue
index cf067a2de..0c4604fef 100644
--- a/dashboard/src/views/EventlogView.vue
+++ b/dashboard/src/views/EventlogView.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-import { ref, reactive, onMounted, onUnmounted, watch } from 'vue';
+import { ref, reactive, onMounted, onUnmounted, watch, useTemplateRef } from 'vue';
 import { Button, TextInput, MultiSelect } from '@cloudron/pankow';
 import { useDebouncedRef, copyToClipboard, prettyLongDate } from '@cloudron/pankow/utils';
 import AppsModel from '../models/AppsModel.js';
@@ -90,6 +90,7 @@ const search = useDebouncedRef('');
 const page = ref(1);
 const perPage = ref(40);
 const actions = reactive([]);
+const eventlogContainer = useTemplateRef('eventlogContainer');
 
 async function onRefresh() {
   refreshBusy.value = true;
@@ -110,21 +111,23 @@ async function onRefresh() {
   refreshBusy.value = false;
 }
 
-async function onScroll(event) {
-  if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
-    page.value++;
-    const [error, result] = await eventlogsModel.search(actions.join(','), search.value, page.value, perPage.value);
-    if (error) return console.error(error);
+async function fetchMore() {
+  page.value++;
+  const [error, result] = await eventlogsModel.search(actions.join(','), search.value, page.value, perPage.value);
+  if (error) return console.error(error);
 
-    eventlogs.value = eventlogs.value.concat(result.map(e => {
-      return {
-        id: Symbol(),
-        raw: e,
-        details: eventlogDetails(e, e.appId ? getApp(e.appId) : null),
-        source: eventlogSource(e, e.appId ? getApp(e.appId) : null)
-      };
-    }));
-  }
+  eventlogs.value = eventlogs.value.concat(result.map(e => {
+    return {
+      id: Symbol(),
+      raw: e,
+      details: eventlogDetails(e, e.appId ? getApp(e.appId) : null),
+      source: eventlogSource(e, e.appId ? getApp(e.appId) : null)
+    };
+  }));
+}
+
+async function onScroll(event) {
+  if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) await fetchMore();
 }
 
 function onCopySource(eventlog) {
@@ -147,7 +150,13 @@ onMounted(async () => {
 
   window.addEventListener('hashchange', onHashChange);
   onHashChange();
-  if (!search.value) onRefresh();
+  if (!search.value) {
+    onRefresh();
+
+    while (eventlogContainer.value.scrollHeight <= eventlogContainer.value.offsetHeight) {
+      await fetchMore();
+    }
+  }
 });
 
 onUnmounted(() => {
@@ -168,7 +177,7 @@ onUnmounted(() => {
           <Button tool secondary @click="onRefresh()" :loading="refreshBusy" icon="fa-solid fa-sync-alt" />
         </div>
       </h1>
-      <div class="section-body" style="overflow: auto; margin-top: 10px; padding-top: 0px" @scroll="onScroll">
+      <div class="section-body" ref="eventlogContainer" style="overflow: auto; margin-top: 10px; padding-top: 0px" @scroll="onScroll">
         <table class="eventlog-table">
           <thead>
             <tr>