diff --git a/frontend/src/HomePage/AppList.jsx b/frontend/src/HomePage/AppList.jsx
index 593f4c8901..cea0156f19 100644
--- a/frontend/src/HomePage/AppList.jsx
+++ b/frontend/src/HomePage/AppList.jsx
@@ -48,7 +48,7 @@ const AppList = (props) => {
           </div>
         </div>
       )}
-      {!props.isLoading && (props.apps?.length === 0 || props.currentFolder?.count == 0) && (
+      {!props.isLoading && props.apps?.length === 0 && (
         <div className="text-center d-block">
           <EmptyFoldersIllustration className="mb-4" data-cy="empty-folder-image" />
           <span
diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
index 8fbefd370e..fd1aa7da97 100644
--- a/frontend/src/HomePage/HomePage.jsx
+++ b/frontend/src/HomePage/HomePage.jsx
@@ -3,6 +3,7 @@ import cx from 'classnames';
 import { appsService, folderService, authenticationService, libraryAppService } from '@/_services';
 import { ConfirmDialog, AppModal } from '@/_components';
 import Select from '@/_ui/Select';
+import _, { sample, isEmpty } from 'lodash';
 import { Folders } from './Folders';
 import { BlankPage } from './BlankPage';
 import { toast } from 'react-hot-toast';
@@ -14,7 +15,6 @@ import HomeHeader from './Header';
 import Modal from './Modal';
 import configs from './Configs/AppIcon.json';
 import { withTranslation } from 'react-i18next';
-import { sample, isEmpty } from 'lodash';
 import ExportAppModal from './ExportAppModal';
 import Footer from './Footer';
 import { OrganizationList } from '@/_components/OrganizationManager/List';
@@ -912,7 +912,7 @@ class HomePageComponent extends React.Component {
                     </span>
                   </div>
                 )}
-                {(isLoading || meta.total_count > 0 || currentFolder.count === 0) && (
+                {(isLoading || meta.total_count > 0 || !_.isEmpty(currentFolder)) && (
                   <AppList
                     apps={apps}
                     canCreateApp={this.canCreateApp}