diff --git a/src/components/upnext.vue b/src/components/upnext.vue
index ff6d6a6d..4d13a42c 100644
--- a/src/components/upnext.vue
+++ b/src/components/upnext.vue
@@ -115,7 +115,7 @@ export default {
   data() {
     return {
       sheet: true,
-      maxTimer: 150000,
+      maxTimer: 15000,
       transitionBarWithStyle: {},
       timeoutId: null,
     };
diff --git a/src/store/actions.js b/src/store/actions.js
index f76667f0..17ea1099 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -36,7 +36,7 @@ export default {
     if (getters['synclounge/AM_I_HOST']) {
       if (timeline.playerState !== 'stopped'
       && timeline.duration && timeline.time
-        && (timeline.duration - timeline.time) < 60000
+        && (timeline.duration - timeline.time) < 10000
         && getters['plexclients/GET_ACTIVE_MEDIA_METADATA'].type === 'episode'
       ) {
         if (!getters.GET_UP_NEXT_TRIGGERED) {