diff --git a/src/apps/experimental/components/library/GenresItemsContainer.tsx b/src/apps/experimental/components/library/GenresItemsContainer.tsx
index cb3029d687..e573d80e53 100644
--- a/src/apps/experimental/components/library/GenresItemsContainer.tsx
+++ b/src/apps/experimental/components/library/GenresItemsContainer.tsx
@@ -18,33 +18,32 @@ const GenresItemsContainer: FC<GenresItemsContainerProps> = ({
     collectionType,
     itemType
 }) => {
-    const { isLoading, data: genresResult } = useGetGenres(
-        itemType,
-        parentId
-    );
+    const { isLoading, data: genresResult } = useGetGenres(itemType, parentId);
 
     if (isLoading) {
         return <Loading />;
     }
 
+    if (!genresResult?.Items?.length) {
+        return (
+            <div className='noItemsMessage centerMessage'>
+                <h1>{globalize.translate('MessageNothingHere')}</h1>
+                <p>{globalize.translate('MessageNoGenresAvailable')}</p>
+            </div>
+        );
+    }
+
     return (
         <>
-            {!genresResult?.Items?.length ? (
-                <div className='noItemsMessage centerMessage'>
-                    <h1>{globalize.translate('MessageNothingHere')}</h1>
-                    <p>{globalize.translate('MessageNoGenresAvailable')}</p>
-                </div>
-            ) : (
-                genresResult?.Items?.map((genre) => (
-                    <GenresSectionContainer
-                        key={genre.Id}
-                        collectionType={collectionType}
-                        parentId={parentId}
-                        itemType={itemType}
-                        genre={genre}
-                    />
-                ))
-            )}
+            {genresResult.Items.map((genre) => (
+                <GenresSectionContainer
+                    key={genre.Id}
+                    collectionType={collectionType}
+                    parentId={parentId}
+                    itemType={itemType}
+                    genre={genre}
+                />
+            ))}
         </>
     );
 };
diff --git a/src/components/ServerContentPage.tsx b/src/components/ServerContentPage.tsx
index c808b7216e..aa3c180a1b 100644
--- a/src/components/ServerContentPage.tsx
+++ b/src/components/ServerContentPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react';
+import { FunctionComponent, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import ServerConnections from './ServerConnections';
@@ -56,7 +56,7 @@ const ServerContentPage: FunctionComponent<ServerContentPageProps> = ({ view })
         location.search
     ]);
 
-    return <></>;
+    return null;
 };
 
 export default ServerContentPage;
diff --git a/src/components/loading/LoadingComponent.tsx b/src/components/loading/LoadingComponent.tsx
index ef8cae21a2..911bd31d07 100644
--- a/src/components/loading/LoadingComponent.tsx
+++ b/src/components/loading/LoadingComponent.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react';
+import { FunctionComponent, useEffect } from 'react';
 
 import loading from './loading';
 
@@ -11,7 +11,7 @@ const Loading: FunctionComponent = () => {
         };
     }, []);
 
-    return <></>;
+    return null;
 };
 
 export default Loading;
diff --git a/src/components/viewManager/ViewManagerPage.tsx b/src/components/viewManager/ViewManagerPage.tsx
index 8795e9edd2..dd2b386e29 100644
--- a/src/components/viewManager/ViewManagerPage.tsx
+++ b/src/components/viewManager/ViewManagerPage.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react';
+import { FunctionComponent, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import globalize from '../../scripts/globalize';
@@ -79,7 +79,7 @@ const ViewManagerPage: FunctionComponent<ViewManagerPageProps> = ({
         location.search
     ]);
 
-    return <></>;
+    return null;
 };
 
 export default ViewManagerPage;