diff --git a/com.twin.app.shoptime/src/App/App.js b/com.twin.app.shoptime/src/App/App.js
index dcd1c22e..587855d2 100644
--- a/com.twin.app.shoptime/src/App/App.js
+++ b/com.twin.app.shoptime/src/App/App.js
@@ -390,21 +390,21 @@ function AppBase(props) {
   }, [dispatch]);
 
   return (
-    <ErrorBoundary>
-      {webOSVersion === "" ? null : Number(webOSVersion) < 4 ? (
-        <NotSupportedVersion />
-      ) : (
-        <MainView
-          initService={initService}
-          className={
-            typeof window === "object" &&
-            !window.PalmSystem &&
-            !cursorVisible &&
-            css.preventMouse
-          }
-        />
-      )}
-    </ErrorBoundary>
+    // <ErrorBoundary>
+    //   {webOSVersion === "" ? null : Number(webOSVersion) < 4 ? (
+    //     <NotSupportedVersion />
+    //   ) : (
+    <MainView
+      initService={initService}
+      className={
+        typeof window === "object" &&
+        !window.PalmSystem &&
+        !cursorVisible &&
+        css.preventMouse
+      }
+    />
+    //   )}
+    // </ErrorBoundary>
   );
 }
 
diff --git a/com.twin.app.shoptime/src/actions/mainActions.js b/com.twin.app.shoptime/src/actions/mainActions.js
index 2adc5539..9885cc09 100644
--- a/com.twin.app.shoptime/src/actions/mainActions.js
+++ b/com.twin.app.shoptime/src/actions/mainActions.js
@@ -260,6 +260,11 @@ export const continueGetSubCategory =
       [];
     const totalCount = subCategoryData[key]?.total ?? 0;
     const startIndex = CATEGORY_DATA_MAX_RESULTS_LIMIT * (pageNo - 1);
+
+    if (totalCount <= startIndex) {
+      return;
+    }
+
     if (
       (startIndex <= 1 && !targetData) ||
       targetData[startIndex] ||
diff --git a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.jsx b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.jsx
index 182de243..8cdaaf04 100644
--- a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.jsx
+++ b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryContents/NoResultsCategory/NoResultsCategoryItems.jsx
@@ -1,22 +1,17 @@
-import React, { useCallback } from 'react';
+import React, { useCallback } from "react";
 
-import {
-  useDispatch,
-  useSelector,
-} from 'react-redux';
+import { useDispatch, useSelector } from "react-redux";
 
-import SpotlightContainerDecorator
-  from '@enact/spotlight/SpotlightContainerDecorator';
+import SpotlightContainerDecorator from "@enact/spotlight/SpotlightContainerDecorator";
 
-import NoResultsImage
-  from '../../../../../assets/images/searchpanel/img-search-nodata.png';
-import { pushPanel } from '../../../../actions/panelActions';
-import SectionTitle from '../../../../components/SectionTitle/SectionTitle';
-import TItemCard from '../../../../components/TItemCard/TItemCard';
-import TScroller from '../../../../components/TScroller/TScroller';
-import { panel_names } from '../../../../utils/Config';
-import { $L } from '../../../../utils/helperMethods';
-import css from './NoResultsCategoryItems.module.less';
+import NoResultsImage from "../../../../../assets/images/searchpanel/img-search-nodata.png";
+import { pushPanel } from "../../../../actions/panelActions";
+import SectionTitle from "../../../../components/SectionTitle/SectionTitle";
+import TItemCard from "../../../../components/TItemCard/TItemCard";
+import TScroller from "../../../../components/TScroller/TScroller";
+import { panel_names } from "../../../../utils/Config";
+import { $L } from "../../../../utils/helperMethods";
+import css from "./NoResultsCategoryItems.module.less";
 
 const Container = SpotlightContainerDecorator({ enterTo: null }, "div");
 export default function NoResultsCategoryItems() {
diff --git a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx
index 02313435..9c16d8aa 100644
--- a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx
+++ b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx
@@ -175,11 +175,12 @@ const CategoryPanel = ({ panelInfo, isOnTop, spotlightId }) => {
     const tabType = tabRef.current === INDEX_SHOWS ? "CAT00101" : "CAT00102";
     const filterType = dropDownTabRef.current === 0 ? "CAT00202" : "CAT00201";
     const pageSize = "20";
+
     if (
-      categoryParams.lgCatCd !== lgCatCd ||
-      categoryParams.tabType !== tabType ||
-      categoryParams.filterType !== filterType ||
-      categoryParams.pageSize !== pageSize
+      categoryParams?.lgCatCd !== lgCatCd ||
+      categoryParams?.tabType !== tabType ||
+      categoryParams?.filterType !== filterType ||
+      categoryParams?.pageSize !== pageSize
     ) {
       dispatch(
         getSubCategory(