diff --git a/.replit b/.replit
index 9eb5d4c..2d8a3dc 100644
--- a/.replit
+++ b/.replit
@@ -40,4 +40,4 @@ args = "npm run dev"
 waitForPort = 5000
 
 [agent]
-integrations = ["javascript_google_analytics==1.0.0", "javascript_database==1.0.0"]
+integrations = ["javascript_database==1.0.0", "javascript_google_analytics==1.0.0"]
diff --git a/server/storage.ts b/server/storage.ts
index c8b1303..c272fca 100644
--- a/server/storage.ts
+++ b/server/storage.ts
@@ -797,7 +797,7 @@ class BunnyStorage implements IStorage {
 
   async getVideos(limit = 20, offset = 0, search?: string): Promise<Video[]> {
     console.log(`Fetching videos from cache: limit=${limit}, offset=${offset}, search=${search}`);
-    const result = await videoSyncService.getVideos(limit, offset, search);
+    const result = videoSyncService.getVideos(limit, offset, search);
     console.log(`Returning ${result.videos.length} videos from cache (age: ${result.cacheAge}ms)`);
     
     // Apply face detection data from cache
@@ -808,18 +808,36 @@ class BunnyStorage implements IStorage {
   }
 
   async getVideo(id: string): Promise<Video | undefined> {
-    // Use videoSyncService which now merges with database edits
-    const video = await videoSyncService.getVideo(id);
-    if (!video) return undefined;
-
-    // Apply cached view counts
-    if (this.viewsCache.has(video.id)) {
-      video.views += this.viewsCache.get(video.id)!;
+    // Try cache first for faster loading
+    const cachedVideo = videoSyncService.getVideos(100, 0).videos.find(v => v.id === id);
+    if (cachedVideo) {
+      // Apply cached view counts
+      if (this.viewsCache.has(cachedVideo.id)) {
+        cachedVideo.views += this.viewsCache.get(cachedVideo.id)!;
+      }
+      
+      // Apply face detection data from cache
+      const faceData = this.faceDataCache.get(cachedVideo.id);
+      return faceData ? { ...cachedVideo, ...faceData } : cachedVideo;
     }
 
-    // Apply face detection data from cache
-    const faceData = this.faceDataCache.get(video.id);
-    return faceData ? { ...video, ...faceData } : video;
+    // Fallback to direct API call
+    try {
+      const video = await this.bunnyService.getVideo(id);
+      if (!video) return undefined;
+
+      // Apply cached view counts
+      if (this.viewsCache.has(video.id)) {
+        video.views += this.viewsCache.get(video.id)!;
+      }
+
+      // Apply face detection data from cache
+      const faceData = this.faceDataCache.get(video.id);
+      return faceData ? { ...video, ...faceData } : video;
+    } catch (error) {
+      console.error(`Error fetching video ${id} from Bunny:`, error);
+      return undefined;
+    }
   }
 
   async createVideo(video: InsertVideo): Promise<Video> {
diff --git a/server/videoSync.ts b/server/videoSync.ts
index 8dc41ca..806e1c1 100644
--- a/server/videoSync.ts
+++ b/server/videoSync.ts
@@ -220,13 +220,13 @@ class VideoSyncService {
     console.log('📅 Scheduled video sync every 5 minutes for optimal performance');
   }
 
-  async getVideos(limit: number = 20, offset: number = 0, search?: string) {
-    let filteredVideos = await this.mergeWithDatabaseEdits(this.cache.videos);
+  getVideos(limit: number = 20, offset: number = 0, search?: string) {
+    let filteredVideos = this.cache.videos;
 
     // Fast client-side search
     if (search && search.length >= 2) {
       const searchLower = search.toLowerCase();
-      filteredVideos = filteredVideos.filter(video => 
+      filteredVideos = this.cache.videos.filter(video => 
         video.title.toLowerCase().includes(searchLower) ||
         video.description?.toLowerCase().includes(searchLower)
       );
@@ -242,52 +242,16 @@ class VideoSyncService {
     };
   }
 
-  private async mergeWithDatabaseEdits(bunnyVideos: any[]) {
-    try {
-      // Fetch all edited videos from database
-      const dbVideos = await db.select().from(videos);
-      const dbVideoMap = new Map(dbVideos.map(v => [v.id, v]));
-      
-      // Merge Bunny.net data with database edits
-      return bunnyVideos.map(bunnyVideo => {
-        const dbVideo = dbVideoMap.get(bunnyVideo.id);
-        if (dbVideo) {
-          // Database has edited version - use edited metadata but keep Bunny.net URLs
-          return {
-            ...bunnyVideo,
-            title: dbVideo.title,
-            description: dbVideo.description,
-            category: dbVideo.category,
-            tags: dbVideo.tags || [],
-            customThumbnailUrl: dbVideo.customThumbnailUrl,
-            isPublic: dbVideo.isPublic,
-            updatedAt: dbVideo.updatedAt
-          };
-        }
-        return bunnyVideo; // No database edits - use original Bunny.net data
-      });
-    } catch (error) {
-      console.warn('Failed to merge database edits, using Bunny.net data only:', error);
-      return bunnyVideos;
-    }
-  }
 
   async getVideo(id: string) {
     // First try cache
     const cachedVideo = this.cache.videos.find(v => v.id === id);
     if (cachedVideo) {
-      // Merge with database edits
-      const mergedVideos = await this.mergeWithDatabaseEdits([cachedVideo]);
-      return mergedVideos[0];
+      return cachedVideo;
     }
 
     // Fallback to direct API call
-    const bunnyVideo = await this.bunnyService.getVideo(id);
-    if (bunnyVideo) {
-      const mergedVideos = await this.mergeWithDatabaseEdits([bunnyVideo]);
-      return mergedVideos[0];
-    }
-    return bunnyVideo;
+    return await this.bunnyService.getVideo(id);
   }
 
   forceVideoRefresh(videoId: string) {