diff --git a/next.config.mjs b/next.config.mjs
index fc19c21..8f06acc 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -4,7 +4,11 @@ const nextConfig = {
   skipTrailingSlashRedirect: true,
   images: {
     unoptimized: false,
-    domains: ['www.qrmaster.net', 'qrmaster.net', 'images.qrmaster.net'],
+    remotePatterns: [
+      { protocol: 'https', hostname: 'www.qrmaster.net' },
+      { protocol: 'https', hostname: 'qrmaster.net' },
+      { protocol: 'https', hostname: 'images.qrmaster.net' },
+    ],
     formats: ['image/webp', 'image/avif'],
     deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
     imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
diff --git a/src/app/(main)/(app)/create/page.tsx b/src/app/(main)/(app)/create/page.tsx
index d73e297..5e3e9c5 100644
--- a/src/app/(main)/(app)/create/page.tsx
+++ b/src/app/(main)/(app)/create/page.tsx
@@ -173,7 +173,7 @@ export default function CreatePage() {
       case 'FEEDBACK':
         return content.feedbackUrl || 'https://example.com/feedback';
       case 'BARCODE':
-        return content.value || '';
+        return isDynamic ? (content.url || '') : (content.value || '');
       default:
         return 'https://example.com';
     }
diff --git a/src/components/dashboard/QRCodeCard.tsx b/src/components/dashboard/QRCodeCard.tsx
index e593d83..38bd17c 100644
--- a/src/components/dashboard/QRCodeCard.tsx
+++ b/src/components/dashboard/QRCodeCard.tsx
@@ -209,10 +209,10 @@ END:VCARD`;
               </div>
             )}
             <div id={`qr-svg-${qr.id}`} className={qr.style?.cornerStyle === 'rounded' ? 'rounded-lg overflow-hidden' : ''}>
-              {qr.contentType === 'BARCODE' && qr.type === 'STATIC' ? (
+              {qr.contentType === 'BARCODE' ? (
                 <Barcode
-                  key={`${qr.content?.value}-${qr.content?.format}`}
-                  value={qr.content?.value || '123456789'}
+                  key={`${qr.id}-${qr.type === 'STATIC' ? qr.content?.value : qrUrl}-${qr.content?.format}`}
+                  value={qr.type === 'STATIC' ? (qr.content?.value || '123456789') : qrUrl}
                   format={(qr.content?.format as any) || 'CODE128'}
                   lineColor={qr.style?.foregroundColor || '#000000'}
                   background={qr.style?.backgroundColor || '#FFFFFF'}