diff --git a/client/src/pages/VideoPage.tsx b/client/src/pages/VideoPage.tsx
index b0dc98e..0d411ab 100644
--- a/client/src/pages/VideoPage.tsx
+++ b/client/src/pages/VideoPage.tsx
@@ -63,10 +63,18 @@ export default function VideoPage() {
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
 
   // Fetch current video
-  const { data: currentVideo, isLoading: videoLoading } = useQuery<Video>({
+  const { data: currentVideo, isLoading: videoLoading, error: videoError } = useQuery<Video>({
     queryKey: [`/api/videos/${videoId}`],
-    queryFn: () => fetch(`/api/videos/${videoId}`).then(res => res.json()),
+    queryFn: async () => {
+      const response = await fetch(`/api/videos/${videoId}`);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch video: ${response.status}`);
+      }
+      return response.json();
+    },
     enabled: !!videoId,
+    retry: 3,
+    retryDelay: 1000,
   });
 
   // Fetch recommended videos (excluding current video)
diff --git a/server/index.ts b/server/index.ts
index 172370b..20e5649 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -76,7 +76,7 @@ app.use((req, res, next) => {
   // Initialize video sync service for automatic Bunny.net updates
   await videoSyncService.initialize();
   
-  // Social media prerendering middleware - mora biti PRED setupVite
+  // Social media prerendering middleware - samo za social bot-e
   app.get('/video/:videoId', async (req, res, next) => {
     const { videoId } = req.params;
     const userAgent = req.get('User-Agent') || '';
@@ -84,9 +84,24 @@ app.use((req, res, next) => {
     // Če je to Facebook, Twitter, WhatsApp ali podoben scraper
     const isSocialBot = /facebookexternalhit|twitterbot|whatsapp|telegrambot|discordbot|slackbot|linkedinbot/i.test(userAgent);
     
+    // Če NI social bot, pustimo da React routing prevzame
+    if (!isSocialBot) {
+      return next();
+    }
+    
     if (isSocialBot) {
       try {
-        const video = await storage.getVideo(videoId);
+        // Support both short and long video IDs for social media
+        let video;
+        
+        // If it's a short ID (8 chars), find video by short ID
+        if (videoId.length === 8) {
+          const allVideosResponse = await storage.getVideos({ limit: 200, offset: 0 });
+          video = allVideosResponse.videos.find((v: any) => v.id.replace(/-/g, '').substring(0, 8) === videoId);
+        } else {
+          // Try as full ID
+          video = await storage.getVideo(videoId);
+        }
         
         if (!video) {
           return next(); // Če video ne obstaja, preusmerimo na običajno SPA