diff --git a/src/Frontend/src/components/failedmessages/MessageList.vue b/src/Frontend/src/components/failedmessages/MessageList.vue
index 775832852..0621d6f7d 100644
--- a/src/Frontend/src/components/failedmessages/MessageList.vue
+++ b/src/Frontend/src/components/failedmessages/MessageList.vue
@@ -81,7 +81,10 @@ function labelClicked($event: MouseEvent, index: number) {
 }
 
 function navigateToMessage(messageId: string) {
-  router.push({ path: routeLinks.messages.failedMessage.link(messageId) });
+  router.push({
+    path: routeLinks.messages.failedMessage.link(messageId),
+    query: { back: router.currentRoute.value.fullPath },
+  });
 }
 
 defineExpose<IMessageList>({