diff --git a/YTLitePlus.xm b/YTLitePlus.xm
index a81adeb..e385615 100644
--- a/YTLitePlus.xm
+++ b/YTLitePlus.xm
@@ -348,18 +348,28 @@ static BOOL IsEnabled(NSString *key) {
 
 // YTUnShorts - https://github.com/PoomSmart/YTUnShorts
 %hook YTIElementRenderer
+
+static NSData *cellDividerData = nil;
+
 - (NSData *)elementData {
     NSString *description = [self description];
+    
     if (IsEnabled(@"UnShorts_enabled")) {
-        if ([description containsString:@"shorts_shelf.eml"] ||
-            [description containsString:@"#shorts"] ||
-            [description containsString:@"shorts_video_cell.eml"] ||
-            [description containsString:@"6Shorts"]) {
-            if (![description containsString:@"history*"]) {
-                return nil;
-            }
+        if ([description containsString:@"cell_divider"]) {
+            if (!cellDividerData) cellDividerData = %orig;
+            return cellDividerData;
         }
+
+        BOOL hasShorts = ([description containsString:@"shorts_shelf.eml"] || 
+                          [description containsString:@"shorts_video_cell.eml"] || 
+                          [description containsString:@"6Shorts"]) && 
+                         ![description containsString:@"history*"];
+        BOOL hasShortsInHistory = [description containsString:@"compact_video.eml"] && 
+                                  [description containsString:@"youtube_shorts_"];
+
+        if (hasShorts || hasShortsInHistory) return cellDividerData;
     }
+
 // Hide Community Posts - @michael-winay & @arichorn
     if (IsEnabled(@"hideCommunityPosts_enabled")) {
         if ([description containsString:@"post_base_wrapper.eml"]) {