diff --git a/app/containers/Network/containers/AccessPoints/index.js b/app/containers/Network/containers/AccessPoints/index.js
index 160420c..d1661b1 100644
--- a/app/containers/Network/containers/AccessPoints/index.js
+++ b/app/containers/Network/containers/AccessPoints/index.js
@@ -165,9 +165,8 @@ const AccessPoints = ({ checkedLocations }) => {
       isLastPage={
         equipData && equipData.filterEquipment && equipData.filterEquipment.context.lastPage
       }
-      onLoading={loading}
-      onError={error}
-      errorDescription="Failed to load equipment."
+      loading={loading}
+      error={error && !equipData?.filterEquipment?.items && 'Failed to load equipment.'}
     />
   );
 };
diff --git a/app/containers/Network/containers/ClientDevices/index.js b/app/containers/Network/containers/ClientDevices/index.js
index 343058d..296e316 100644
--- a/app/containers/Network/containers/ClientDevices/index.js
+++ b/app/containers/Network/containers/ClientDevices/index.js
@@ -90,9 +90,8 @@ const ClientDevices = ({ checkedLocations }) => {
       tableData={data && data.filterClientSessions && data.filterClientSessions.items}
       onLoadMore={handleLoadMore}
       isLastPage={data && data.filterClientSessions && data.filterClientSessions.context.lastPage}
-      onLoading={loading}
-      onError={error}
-      errorDescription="Failed to load client devices."
+      loading={loading}
+      error={error && !data?.filterClientSessions?.items && 'Failed to load client devices.'}
     />
   );
 };