diff --git a/MediaServiceCore b/MediaServiceCore
index a1e0d2931..637225b98 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit a1e0d2931ba449e4e6278878d7e7e06b4c98e02d
+Subproject commit 637225b98e66d7566f769e0d36a8f2e7d9a0bcbe
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/VideoGroup.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/VideoGroup.java
index ce3c9f67c..8eb0d02bd 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/VideoGroup.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/data/VideoGroup.java
@@ -93,11 +93,12 @@ public class VideoGroup {
         VideoGroup videoGroup = new VideoGroup();
         videoGroup.mSection = section;
         videoGroup.mPosition = groupPosition;
-        videoGroup.mId = videoGroup.hashCode();
         videoGroup.mVideos = new ArrayList<>();
         videoGroup.mMediaGroup = mediaGroup;
         videoGroup.mTitle = mediaGroup != null && mediaGroup.getTitle() != null ?
                 mediaGroup.getTitle() : section != null ? section.getTitle() : null;
+        // Fix duplicated rows e.g. Shorts
+        videoGroup.mId = videoGroup.mTitle != null ? videoGroup.mTitle.hashCode() : videoGroup.hashCode();
 
         if (mediaGroup == null) {
             return videoGroup;