diff --git a/src/components/BackButton.vue b/src/components/BackButton.vue
index 246a6c1..d8e3471 100644
--- a/src/components/BackButton.vue
+++ b/src/components/BackButton.vue
@@ -1,10 +1,18 @@
 <script setup lang="ts">
 import { useRouter, type RouteLocationRaw } from "vue-router"
 
-const props = defineProps<{ fallback?: RouteLocationRaw }>()
+const props = withDefaults(
+  defineProps<{ fallback?: RouteLocationRaw; preferFallback?: boolean }>(),
+  { preferFallback: true },
+)
 
 const router = useRouter()
 const goBack = () => {
+  if (props.preferFallback && props.fallback) {
+    router.push(props.fallback)
+    return
+  }
+
   if (window.history.state?.back) {
     router.back()
   } else if (props.fallback) {
diff --git a/src/views/PublicNoteView.vue b/src/views/PublicNoteView.vue
index b8b181a..9bf4b1d 100644
--- a/src/views/PublicNoteView.vue
+++ b/src/views/PublicNoteView.vue
@@ -99,7 +99,10 @@ watch(
       </span>
       <article class="note-display" v-html="content"></article>
 
-      <BackButton :fallback="{ name: 'PublicNoteListByDidView', params: { did } }" />
+      <back-button
+        :fallback="{ name: 'PublicNoteListByDidView', params: { did } }"
+        :prefer-fallback="false"
+      />
     </div>
     <stacked-public-note
       v-for="(stackedNote, index) in stackedNotes"