diff --git a/app/Http/Controllers/Public/QrScanController.php b/app/Http/Controllers/Public/QrScanController.php
index 3fa3810..db8d519 100644
--- a/app/Http/Controllers/Public/QrScanController.php
+++ b/app/Http/Controllers/Public/QrScanController.php
@@ -36,7 +36,7 @@ class QrScanController extends Controller
         }
 
         if ($qrCode->isDocumentType()) {
-            return redirect()->route('qr.public.view', $shortCode);
+            return redirect()->away($qrCode->publicPath('view'));
         }
 
         if ($qrCode->isBookType()) {
@@ -62,7 +62,7 @@ class QrScanController extends Controller
 
         return view('public.qr.document-viewer', [
             'qrCode'       => $qrCode,
-            'fileUrl'      => route('qr.public.file', $shortCode),
+            'fileUrl'      => $qrCode->publicPath('file'),
             'allowDownload' => (bool) ($qrCode->content()['allow_download'] ?? true),
         ]);
     }
diff --git a/resources/views/public/qr/document-viewer.blade.php b/resources/views/public/qr/document-viewer.blade.php
index 8aa9496..b6bd40b 100644
--- a/resources/views/public/qr/document-viewer.blade.php
+++ b/resources/views/public/qr/document-viewer.blade.php
@@ -110,7 +110,7 @@
 <div id="toolbar">
     <span class="tb-label">{{ $qrCode->label }}</span>
     @if($allowDownload)
-    <a href="{{ route('qr.public.file', $qrCode->short_code) }}" download class="tb-download">
+    <a href="{{ $qrCode->publicPath('file') }}" download class="tb-download">
         <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
             <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12 12 16.5m0 0L7.5 12m4.5 4.5V3"/>
         </svg>
diff --git a/resources/views/qr-codes/badges.blade.php b/resources/views/qr-codes/badges.blade.php
index 6c0256d..9949d54 100644
--- a/resources/views/qr-codes/badges.blade.php
+++ b/resources/views/qr-codes/badges.blade.php
@@ -3,7 +3,7 @@
     $evColor = $c['brand_color'] ?? '#4f46e5';
     $evName = $c['name'] ?? $qrCode->label;
     $hasLogo = !empty($c['logo_path']);
-    $logoUrl = $hasLogo ? route('qr.public.event.logo', $qrCode->short_code) : null;
+    $logoUrl = $hasLogo ? $qrCode->publicPath('event-logo') : null;
     $size = $c['badge_size'] ?? '4x3';
     // Physical badge dimensions (inches)
     [$bw, $bh] = match ($size) {