diff --git a/MediaServiceCore b/MediaServiceCore
index 2f7073074..f183726ac 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit 2f70730743e1ccaaef8c1ffdecc2e0c392217b90
+Subproject commit f183726acc5c81085e8456e2054545ddeac0565e
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
index 45b70204e..5e2f31ce2 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/VideoStateController.java
@@ -64,11 +64,9 @@ public class VideoStateController extends BasePlayerController {
 
         enableIncognitoIfNeeded(item);
 
-        if (!item.equals(getVideo())) { // skip switch from the embed to the fullscreen one
-            // Don't do reset on videoLoaded state because this will influences minimized music videos.
-            resetPositionIfNeeded(item);
-            resetGlobalSpeedIfNeeded();
-        }
+        // Don't do reset on videoLoaded state because this will influences minimized music videos.
+        resetPositionIfNeeded(item);
+        resetGlobalSpeedIfNeeded();
     }
 
     @Override
@@ -328,6 +326,12 @@ public class VideoStateController extends BasePlayerController {
             isLive = false;
         }
 
+        // Don't reset if doing switch from the embed to the fullscreen one
+        boolean sameVideo = item.equals(getVideo());
+        if (sameVideo) {
+            isShort = false;
+        }
+
         if (isShort || isVideoEnded || isLive) {
             resetPosition(item);
         }