diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 2871a9b3f..3329624fd 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -62,6 +62,11 @@ const Library = ({ model, urlParams, queryParams }) => {
             scrollContainerRef.current.scrollTop = 0;
         }
     }, [profile.auth, library.selected]);
+    React.useEffect(() => {
+        if (!library.selected?.type && typeSelect.selected) {
+            window.location = typeSelect.selected[0];
+        }
+    }, [typeSelect.selected, library.selected]);
     return (
         <MainNavBars className={styles['library-container']} route={model}>
             <div className={styles['library-content']}>
diff --git a/src/routes/Library/useSelectableInputs.js b/src/routes/Library/useSelectableInputs.js
index 6f24dc2c9..d173d663a 100644
--- a/src/routes/Library/useSelectableInputs.js
+++ b/src/routes/Library/useSelectableInputs.js
@@ -4,6 +4,8 @@ const React = require('react');
 const { useTranslate } = require('stremio/common');
 
 const mapSelectableInputs = (library, t) => {
+    const selectedType = library.selectable.types
+        .filter(({ selected }) => selected).map(({ deepLinks }) => deepLinks.library);
     const typeSelect = {
         title: t.string('SELECT_TYPE'),
         options: library.selectable.types
@@ -11,9 +13,9 @@ const mapSelectableInputs = (library, t) => {
                 value: deepLinks.library,
                 label: type === null ? t.string('TYPE_ALL') : t.stringWithPrefix(type, 'TYPE_')
             })),
-        selected: library.selectable.types
-            .filter(({ selected }) => selected)
-            .map(({ deepLinks }) => deepLinks.library),
+        selected: selectedType.length
+            ? selectedType
+            : [library.selectable.types[0]].map(({ deepLinks }) => deepLinks.library),
         onSelect: (event) => {
             window.location = event.value;
         }