diff --git a/client/src/pages/GeschichteLiedPage.tsx b/client/src/pages/GeschichteLiedPage.tsx
index 88916d8..c9a1f66 100644
--- a/client/src/pages/GeschichteLiedPage.tsx
+++ b/client/src/pages/GeschichteLiedPage.tsx
@@ -55,7 +55,6 @@ export default function GeschichteLiedPage() {
   const handleTouchStart = (e: React.TouchEvent) => {
     setTouchEnd(0);
     setTouchStart(e.targetTouches[0].clientX);
-    console.log('Geschichte: Touch start, videos:', geschichteVideos.length, 'totalPages:', totalPages);
   };
 
   const handleTouchMove = (e: React.TouchEvent) => {
diff --git a/client/src/pages/GipfelstammtischPage.tsx b/client/src/pages/GipfelstammtischPage.tsx
index e30a4d8..10e7c8e 100644
--- a/client/src/pages/GipfelstammtischPage.tsx
+++ b/client/src/pages/GipfelstammtischPage.tsx
@@ -55,7 +55,6 @@ export default function GipfelstammtischPage() {
   const handleTouchStart = (e: React.TouchEvent) => {
     setTouchEnd(0);
     setTouchStart(e.targetTouches[0].clientX);
-    console.log('Gipfel: Touch start, videos:', gipfelVideos.length, 'totalPages:', totalPages);
   };
 
   const handleTouchMove = (e: React.TouchEvent) => {
diff --git a/client/src/pages/VideoPage.tsx b/client/src/pages/VideoPage.tsx
index 13aeb75..36faa02 100644
--- a/client/src/pages/VideoPage.tsx
+++ b/client/src/pages/VideoPage.tsx
@@ -76,7 +76,44 @@ export default function VideoPage() {
   });
 
   const recommendedVideos = recommendedResponse?.videos?.filter(v => v.id !== videoId) || [];
-  const allVideos = recommendedResponse?.videos || [];
+  
+  // Filter videos based on current video category for navigation
+  const getFilteredVideosForNavigation = () => {
+    const allVideos = recommendedResponse?.videos || [];
+    if (!currentVideo) return allVideos;
+    
+    // Check if current video belongs to a specific category
+    if (currentVideo.title.includes("FOLX STADL") || currentVideo.title.includes("FOLXSTADL")) {
+      return allVideos.filter(video => 
+        video.title.includes("FOLX STADL") || video.title.includes("FOLXSTADL")
+      );
+    }
+    
+    if (currentVideo.title.includes("Gipfelstammtisch") || 
+        currentVideo.title.includes("GIPFELSTAMMTISCH") ||
+        currentVideo.title.includes("Gipfel Stammtisch")) {
+      return allVideos.filter(video => 
+        video.title.includes("Gipfelstammtisch") || 
+        video.title.includes("GIPFELSTAMMTISCH") ||
+        video.title.includes("Gipfel Stammtisch")
+      );
+    }
+    
+    if (currentVideo.title.includes("Die Geschichte des Liedes") || 
+        currentVideo.title.includes("Geschichte des Liedes") ||
+        currentVideo.title.includes("GESCHICHTE DES LIEDES")) {
+      return allVideos.filter(video => 
+        video.title.includes("Die Geschichte des Liedes") || 
+        video.title.includes("Geschichte des Liedes") ||
+        video.title.includes("GESCHICHTE DES LIEDES")
+      );
+    }
+    
+    // If not in any specific category, return all videos
+    return allVideos;
+  };
+  
+  const allVideos = getFilteredVideosForNavigation();
   
   // Navigation functions
   const getCurrentVideoIndex = () => {