diff --git a/pages/officer/operation/department/index.js b/pages/officer/operation/department/index.js
index 36f26e37..a331315c 100644
--- a/pages/officer/operation/department/index.js
+++ b/pages/officer/operation/department/index.js
@@ -65,7 +65,7 @@ export default function DepartmentList({isPagePermissionSuccess, departments}) {
                     </button>
                 </div>
                 {(
-                    departments != null
+                    departments.length !== 0
                         ?
                         <div className="flex flex-col">
                             <div className="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
diff --git a/pages/officer/operation/faculty/index.js b/pages/officer/operation/faculty/index.js
index 7f6bf104..dad5f645 100644
--- a/pages/officer/operation/faculty/index.js
+++ b/pages/officer/operation/faculty/index.js
@@ -65,7 +65,7 @@ export default function FacultyList({isPagePermissionSuccess, faculties}) {
                     </button>
                 </div>
                 {(
-                    faculties != null
+                    faculties.length !== 0
                         ?
                         <div className="flex flex-col">
                             <div className="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
diff --git a/pages/officer/operation/lesson/index.js b/pages/officer/operation/lesson/index.js
index b027c0e5..fb8f3b6b 100644
--- a/pages/officer/operation/lesson/index.js
+++ b/pages/officer/operation/lesson/index.js
@@ -64,6 +64,9 @@ export default function TeacherLessonList({isPagePermissionSuccess, lessons}) {
                         DERS EKLE
                     </button>
                 </div>
+                {(
+                    lessons.length !== 0
+                        ?
                 <div className="flex flex-col">
                     <div className="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
                         <div className="py-2 align-middle inline-block min-w-full sm:px-6 lg:px-8">
@@ -98,8 +101,6 @@ export default function TeacherLessonList({isPagePermissionSuccess, lessons}) {
                                     </tr>
                                     </thead>
                                     <tbody className="bg-white divide-y divide-gray-200">
-                                    {
-                                    }
                                     {lessons.map((lesson) => (
                                         <tr key={lesson.lessonId}>
                                             <td className="px-6 py-4 whitespace-nowrap">
@@ -264,6 +265,9 @@ export default function TeacherLessonList({isPagePermissionSuccess, lessons}) {
                     {/*            </Dialog>*/}
                     {/*        </Transition>*/}
                 </div>
+                        :
+                        null
+                )}
             </div>
         </div>
 
diff --git a/pages/officer/operation/staff/index.js b/pages/officer/operation/staff/index.js
index ad04624f..7505ed97 100644
--- a/pages/officer/operation/staff/index.js
+++ b/pages/officer/operation/staff/index.js
@@ -64,7 +64,7 @@ export default function OfficerList({isPagePermissionSuccess, officers}) {
                     </button>
                 </div>
                 {(
-                    officers !== null
+                    officers.length !== 0
                         ?
                         <div className="flex flex-col">
                             <div className="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
diff --git a/pages/officer/operation/student/index.js b/pages/officer/operation/student/index.js
index fdd7ebda..30a80c92 100644
--- a/pages/officer/operation/student/index.js
+++ b/pages/officer/operation/student/index.js
@@ -64,7 +64,7 @@ export default function StudentList({isPagePermissionSuccess, students}) {
                     </button>
                 </div>
                 {(
-                    students != null
+                    students.length !== 0
                         ?
                         <div className="flex flex-col">
                             <div className="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
diff --git a/pages/officer/operation/teacher/index.js b/pages/officer/operation/teacher/index.js
index 18407f18..d31d5ebd 100644
--- a/pages/officer/operation/teacher/index.js
+++ b/pages/officer/operation/teacher/index.js
@@ -65,7 +65,7 @@ export default function TeacherList({isPagePermissionSuccess, teachers}) {
                     </button>
                 </div>
                 {(
-                    teachers !== null
+                    teachers.length !== 0
                         ?
                         <div className="flex flex-col">
                             <div className="-my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">