diff --git a/packages/core/upload/admin/src/hooks/useAssets.js b/packages/core/upload/admin/src/hooks/useAssets.js
index bbf8c7c4f0..82cf5e1d5d 100644
--- a/packages/core/upload/admin/src/hooks/useAssets.js
+++ b/packages/core/upload/admin/src/hooks/useAssets.js
@@ -9,7 +9,7 @@ export const useAssets = ({ skipWhen }) => {
   const { formatMessage } = useIntl();
   const toggleNotification = useNotification();
   const { notifyStatus } = useNotifyAT();
-  const [{ rawQuery, query }, setQuery] = useQueryParams();
+  const [{ rawQuery }] = useQueryParams();
   const dataRequestURL = getRequestUrl('files');
 
   const getAssets = async () => {
@@ -24,12 +24,6 @@ export const useAssets = ({ skipWhen }) => {
     cacheTime: 0,
   });
 
-  useEffect(() => {
-    if (!query) {
-      setQuery({ sort: 'updatedAt:DESC', page: 1, pageSize: 10 });
-    }
-  }, [query, setQuery]);
-
   useEffect(() => {
     if (data) {
       notifyStatus(
diff --git a/packages/core/upload/admin/src/pages/App/index.js b/packages/core/upload/admin/src/pages/App/index.js
index a4ad2ee50e..ff97f35c85 100644
--- a/packages/core/upload/admin/src/pages/App/index.js
+++ b/packages/core/upload/admin/src/pages/App/index.js
@@ -1,8 +1,17 @@
-import React from 'react';
+import React, { useEffect } from 'react';
+import { useQueryParams } from '@strapi/helper-plugin';
 import { MediaLibrary } from './MediaLibrary';
 
 const App = () => {
-  return <MediaLibrary />;
+  const [{ rawQuery }, setQuery] = useQueryParams();
+
+  useEffect(() => {
+    if (!rawQuery) {
+      setQuery({ sort: 'updatedAt:DESC', page: 1, pageSize: 10 });
+    }
+  }, [rawQuery, setQuery]);
+
+  return rawQuery ? <MediaLibrary /> : null;
 };
 
 export default App;