diff --git a/src/_screens/criteria/criteria-manage/index.js b/src/_screens/criteria/criteria-manage/index.js
index fe2c19c..fc1c69c 100644
--- a/src/_screens/criteria/criteria-manage/index.js
+++ b/src/_screens/criteria/criteria-manage/index.js
@@ -339,7 +339,9 @@ export default function CriteriaManage() {
         }`;
         const res = await apiCaller(endPoint, "GET");
 
-        if (res?.status) {
+        if (!res){
+          setIsEndOnlineClasses(true);
+        } else {
           listNext = res?.data;
           setOffsetOnline(offsetOnline + limitOnline);
           if (res?.data?.length < limitOnline) {
diff --git a/src/_screens/home/admin/index.js b/src/_screens/home/admin/index.js
index 78f16c1..bf5c74e 100644
--- a/src/_screens/home/admin/index.js
+++ b/src/_screens/home/admin/index.js
@@ -288,8 +288,9 @@ export default function AdminHome() {
           queryParams.length ? `&${queryParams.join("&")}` : ""
         }`;
         const res = await apiCaller(endPoint, "GET");
-
-        if (res?.status) {
+        if(!res){
+          setIsEndOnlineClasses(true);
+        } else {
           concatListSide = res?.data;
           setOffsetOnline(offsetOnline + limitOnline);
           if (res?.data?.length < limitOnline) {
diff --git a/src/_screens/home/detail-grade/index.js b/src/_screens/home/detail-grade/index.js
index aac1753..fbe0a0d 100644
--- a/src/_screens/home/detail-grade/index.js
+++ b/src/_screens/home/detail-grade/index.js
@@ -167,9 +167,9 @@ export default function DetailGrade() {
         }&limit=${limitOnline}&offset=${offsetOnlineMore}`;
         const res = await apiCaller(endPoint, "GET");
         console.log('res',res);
-        if(res){
+        if(!res){
           setIsEndOnlineClasses(true);
-        }else if (res?.status) {
+        } else {
           listNext = res?.data;
           setOffsetOnline(offsetOnline + limitOnline);
           if (res?.data?.length < limitOnline) {
diff --git a/src/_screens/home/headmaster/index.js b/src/_screens/home/headmaster/index.js
index 7204803..5188c80 100644
--- a/src/_screens/home/headmaster/index.js
+++ b/src/_screens/home/headmaster/index.js
@@ -184,7 +184,9 @@ export default function HeadmasterHome() {
           const endPoint = `/report/api_report/teacherByOrganizationId?organization_id=${id}&limit=${limitOnline}&offset=${offsetOnlineMore}`;
           const res = await apiCaller(endPoint, "GET");
   
-          if (res?.status) {
+          if (!res){
+          setIsEndOnlineClasses(true);
+          } else {
             listNext = res?.data;
             setOffsetOnline(offsetOnline + limitOnline);
             if (res?.data?.length < limitOnline) {
diff --git a/src/_screens/home/teacher/index.js b/src/_screens/home/teacher/index.js
index 8853394..1306247 100644
--- a/src/_screens/home/teacher/index.js
+++ b/src/_screens/home/teacher/index.js
@@ -184,7 +184,9 @@ export default function TeacherHome() {
         `/api_exercise_report/teacher_report_summary?teacher_id=${id}&year=${schoolYear?.value.trim()}&limit=${limitOnline}&offset=${offsetOnlineMore}` +
         (queryParams.length > 0 ? `&${queryParams.join("&")}` : "");
         const res = await apiCaller(endPoint, "GET");
-        if (res?.status) {
+        if (!res){
+          setIsEndOnlineClasses(true);
+        } else {
           concatListSide = res?.data;
           setOffsetOnline(offsetOnline + limitOnline);
           if (res?.data?.length < limitOnline) {