diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 74f272b52..f22a12236 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -59,7 +59,7 @@ const Library = ({ model, urlParams, queryParams }) => {
     }, [hasNextPage, loadNextPage]);
     const onScroll = useOnScrollToBottom(onScrollToBottom, SCROLL_TO_BOTTOM_TRESHOLD);
     React.useLayoutEffect(() => {
-        if (profile.auth !== null && library.selected && library.selected.request.page === 1 && library.catalog.length !== 0) {
+        if (scrollContainerRef.current !== null && library.selected && library.selected.request.page === 1 && library.catalog.length !== 0) {
             scrollContainerRef.current.scrollTop = 0;
         }
     }, [profile.auth, library.selected]);
@@ -73,35 +73,35 @@ const Library = ({ model, urlParams, queryParams }) => {
                             <Chips {...sortChips} className={styles['select-input-container']} />
                         </div>
                         {
-                            model === 'library' ?
-                                library.selected === null ?
-                                    <DelayedRenderer delay={500}>
-                                        <div className={styles['message-container']}>
-                                            <Image
-                                                className={styles['image']}
-                                                src={require('/images/empty.png')}
-                                                alt={' '}
-                                            />
-                                            <div className={styles['message-label']}>{model === 'library' ? 'Library' : 'Continue Watching'} not loaded!</div>
-                                        </div>
-                                    </DelayedRenderer>
+                            library.selected === null ?
+                                <DelayedRenderer delay={500}>
+                                    <div className={styles['message-container']}>
+                                        <Image
+                                            className={styles['image']}
+                                            src={require('/images/empty.png')}
+                                            alt={' '}
+                                        />
+                                        <div className={styles['message-label']}>{model === 'library' ? 'Library' : 'Continue Watching'} not loaded!</div>
+                                    </div>
+                                </DelayedRenderer>
+                                :
+                                library.catalog.length === 0 ?
+                                    <div className={styles['message-container']}>
+                                        <Image
+                                            className={styles['image']}
+                                            src={require('/images/empty.png')}
+                                            alt={' '}
+                                        />
+                                        <div className={styles['message-label']}>Empty {model === 'library' ? 'Library' : 'Continue Watching'}</div>
+                                    </div>
                                     :
-                                    library.catalog.length === 0 ?
-                                        <div className={styles['message-container']}>
-                                            <Image
-                                                className={styles['image']}
-                                                src={require('/images/empty.png')}
-                                                alt={' '}
-                                            />
-                                            <div className={styles['message-label']}>Empty {model === 'library' ? 'Library' : 'Continue Watching'}</div>
-                                        </div>
-                                        :
-                                        <div ref={scrollContainerRef} className={classnames(styles['meta-items-container'], 'animation-fade-in')} onScroll={onScroll}>
-                                            {library.catalog.map((libItem, index) => (
+                                    <div ref={scrollContainerRef} className={classnames(styles['meta-items-container'], 'animation-fade-in')} onScroll={onScroll}>
+                                        {
+                                            library.catalog.map((libItem, index) => (
                                                 <LibItem {...libItem} notifications={notifications} removable={model === 'library'} key={index} />
-                                            ))}
-                                        </div>
-                                : null
+                                            ))
+                                        }
+                                    </div>
                         }
                     </div>
                     :