diff --git a/client/agenda/AgendaMobileBar.vue b/client/agenda/AgendaMobileBar.vue
index 63611e21c2..43480bedd3 100644
--- a/client/agenda/AgendaMobileBar.vue
+++ b/client/agenda/AgendaMobileBar.vue
@@ -124,11 +124,11 @@ const downloadIcsOptions = [
 
 function jumpToDay (dayId) {
   if (dayId === 'now') {
-    const lastEventId = agendaStore.findCurrentEventId()
-    if (lastEventId) {
-      document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
+    const nowEventId = agendaStore.findNowEventId()
+    if (nowEventId) {
+      document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
     } else {
-      message.warning('There is no event happening right now.')
+      message.warning('There is no event happening right now or in the future.')
     }
   } else {
     document.getElementById(dayId)?.scrollIntoView(true)
diff --git a/client/agenda/AgendaQuickAccess.vue b/client/agenda/AgendaQuickAccess.vue
index b226d09c60..c9412f6663 100644
--- a/client/agenda/AgendaQuickAccess.vue
+++ b/client/agenda/AgendaQuickAccess.vue
@@ -204,12 +204,12 @@ function scrollToDay (daySlug, ev) {
 }
 
 function scrollToNow (ev) {
-  const lastEventId = agendaStore.findCurrentEventId()
+  const nowEventId = agendaStore.findNowEventId()
 
-  if (lastEventId) {
-    document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
+  if (nowEventId) {
+    document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
   } else {
-    message.warning('There is no event happening right now.')
+    message.warning('There is no event happening right now or in the future.')
   }
 }
 
diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue
index ab0f6e0184..2432776e05 100644
--- a/client/agenda/AgendaScheduleList.vue
+++ b/client/agenda/AgendaScheduleList.vue
@@ -590,10 +590,10 @@ function renderLinkLabel (opt) {
 
 function recalculateRedLine () {
   state.currentMinute = DateTime.local().minute
-  const lastEventId = agendaStore.findCurrentEventId()
+  const currentEventId = agendaStore.findCurrentEventId()
 
-  if (lastEventId) {
-    state.redhandOffset = document.getElementById(`agenda-rowid-${lastEventId}`)?.offsetTop || 0
+  if (currentEventId) {
+    state.redhandOffset = document.getElementById(`agenda-rowid-${currentEventId}`)?.offsetTop || 0
   } else {
     state.redhandOffset = 0
   }
@@ -614,9 +614,13 @@ function recalculateRedLine () {
       return
     }
     unsubscribe() // we only need to scroll once, so unsubscribe from future updates
-    if(window.location.hash === "#now") {
-      const lastEventId = agendaStore.findCurrentEventId()
-      document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
+    if (window.location.hash === "#now") {
+      const nowEventId = agendaStore.findNowEvent()
+      if (nowEventId) {
+        document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
+      } else {
+        message.warning('There is no event happening right now or in the future.')
+      }
     } else if(window.location.hash.startsWith(`#${daySlugPrefix}`)) {
       document.getElementById(window.location.hash.substring(1))?.scrollIntoView(true)
     }
diff --git a/client/agenda/store.js b/client/agenda/store.js
index 71c1219725..359c5fbf05 100644
--- a/client/agenda/store.js
+++ b/client/agenda/store.js
@@ -230,6 +230,28 @@ export const useAgendaStore = defineStore('agenda', {
 
       return lastEvent.id || null
     },
+    findNowEventId () {
+      const currentEventId = this.findCurrentEventId()
+      
+      if (currentEventId) {
+        return currentEventId
+      }
+
+      // if there isn't a current event then instead find the next event
+
+      const current = (this.nowDebugDiff ? DateTime.local().minus(this.nowDebugDiff) : DateTime.local()).setZone(this.timezone)
+
+      // -> Find next event after current time
+      let nextEventId = undefined
+      for(const sh of this.scheduleAdjusted) {
+        if (sh.adjustedStart > current) {
+          nextEventId = sh.id
+          break
+        }
+      }
+
+      return nextEventId || null
+    },
     hideLoadingScreen () {
       // -> Hide loading screen
       const loadingRef = document.querySelector('#app-loading')