diff --git a/ipi-survey-platform/src/components/admin/SubmissionTable.jsx b/ipi-survey-platform/src/components/admin/SubmissionTable.jsx
index a2af99c..054b2fe 100644
--- a/ipi-survey-platform/src/components/admin/SubmissionTable.jsx
+++ b/ipi-survey-platform/src/components/admin/SubmissionTable.jsx
@@ -133,9 +133,12 @@ const SubmissionTable = ({ selectedQuarter, selectedYear }) => {
 
   return (
     <div
-      className="border border-[#E5E7EB] bg-white shadow-[0_16px_32px_rgba(15,23,42,0.06)] rounded-[8px]"
-      style={{ width: '1250px', minHeight: '780px' }}
-    >
+    className="border border-[#E5E7EB] bg-white shadow-[0_16px_32px_rgba(15,23,42,0.06)] rounded-[8px]"
+    style={{
+      width: '1250px',
+      minHeight: filtered.length === 0 || loading ? 'auto' : '780px',
+    }}
+  >  
       <div className="space-y-[1px] overflow-x-auto">
         <div className="px-6 pt-6 pb-4">
           <h2 className="text-[18px] leading-[28px] font-medium text-[#232528]">
@@ -144,84 +147,88 @@ const SubmissionTable = ({ selectedQuarter, selectedYear }) => {
         </div>
 
         {loading ? (
-          <div className="flex items-center justify-center h-[500px] text-gray-500">
-            Loading submissions...
-          </div>
-        ) : (
-          <div className="min-w-[1200px]">
-            <Table
-              headers={headers}
-              rows={tableRows}
-              separated
-              rowGapClass="border-spacing-y-1"
-              pagination={{
-                currentPage,
-                onPageChange: setCurrentPage,
-                pageSize,
-                totalItems: filtered.length,
-              }}
-              columnWidths={columnWidths}
-              renderCell={(value, _, columnIndex) => {
-                if (columnIndex === 10) {
-                  const item = value;
-                  return (
-                    <div className="flex items-center justify-center gap-[10px]">
-                      <div className="relative group">
-                        <CheckCircle2
-                          size={22}
-                          className="text-green-600 cursor-pointer hover:scale-110 transition-transform"
-                          onClick={() =>
-                            navigate(`/admin/validations/${item.id}`, {
-                              state: { actionType: 'approve' },
-                            })
-                          }
-                        />
-                        <span className="absolute bottom-full mb-1 left-1/2 -translate-x-1/2 bg-black text-white text-xs px-2 py-[2px] rounded opacity-0 group-hover:opacity-100 transition">
-                          Approve
-                        </span>
-                      </div>
+  <div className="flex items-center justify-center h-[500px] text-gray-500">
+    Loading submissions...
+  </div>
+) : filtered.length === 0 ? (
+  <div className="flex items-center justify-center py-8 min-h-[180px] text-[#7B5C1F] font-semibold text-[15px]">
+    No Submission Found
+  </div>
+) : (
+  <div className="min-w-[1200px]">
+    <Table
+      headers={headers}
+      rows={tableRows}
+      separated
+      rowGapClass="border-spacing-y-1"
+      pagination={{
+        currentPage,
+        onPageChange: setCurrentPage,
+        pageSize,
+        totalItems: filtered.length,
+      }}
+      columnWidths={columnWidths}
+      renderCell={(value, _, columnIndex) => {
+        if (columnIndex === 10) {
+          const item = value;
+          return (
+            <div className="flex items-center justify-center gap-[10px]">
+              <div className="relative group">
+                <CheckCircle2
+                  size={22}
+                  className="text-green-600 cursor-pointer hover:scale-110 transition-transform"
+                  onClick={() =>
+                    navigate(`/admin/validations/${item.id}`, {
+                      state: { actionType: 'approve' },
+                    })
+                  }
+                />
+                <span className="absolute bottom-full mb-1 left-1/2 -translate-x-1/2 bg-black text-white text-xs px-2 py-[2px] rounded opacity-0 group-hover:opacity-100 transition">
+                  Approve
+                </span>
+              </div>
 
-                      <div className="relative group">
-                        <XCircle
-                          size={22}
-                          className="text-red-600 cursor-pointer hover:scale-110 transition-transform"
-                          onClick={() =>
-                            navigate(`/admin/validations/${item.id}`, {
-                              state: { actionType: 'reject' },
-                            })
-                          }
-                        />
-                        <span className="absolute bottom-full mb-1 left-1/2 -translate-x-1/2 bg-black text-white text-xs px-2 py-[2px] rounded opacity-0 group-hover:opacity-100 transition">
-                          Reject
-                        </span>
-                      </div>
+              <div className="relative group">
+                <XCircle
+                  size={22}
+                  className="text-red-600 cursor-pointer hover:scale-110 transition-transform"
+                  onClick={() =>
+                    navigate(`/admin/validations/${item.id}`, {
+                      state: { actionType: 'reject' },
+                    })
+                  }
+                />
+                <span className="absolute bottom-full mb-1 left-1/2 -translate-x-1/2 bg-black text-white text-xs px-2 py-[2px] rounded opacity-0 group-hover:opacity-100 transition">
+                  Reject
+                </span>
+              </div>
 
-                      <div className="relative group">
-                        <Eye
-                          size={22}
-                          className={`cursor-pointer hover:scale-110 transition-transform ${
-                            item.status?.toLowerCase() === 'pending'
-                              ? 'text-[#9E792B]'
-                              : 'text-gray-500'
-                          }`}
-                          onClick={() =>
-                            navigate(`/admin/validations/${item.id}`, {
-                              state: { actionType: 'view' },
-                            })
-                          }
-                        />
-                        <span className="absolute bottom-full mb-1 left-1/2 -translate-x-1/2 bg-black text-white text-xs px-2 py-[2px] rounded opacity-0 group-hover:opacity-100 transition">
-                          View
-                        </span>
-                      </div>
-                    </div>
-                  );
-                }
-                return value;
-              }}
-            />
-          </div>
-        )}
+              <div className="relative group">
+                <Eye
+                  size={22}
+                  className={`cursor-pointer hover:scale-110 transition-transform ${
+                    item.status?.toLowerCase() === 'pending'
+                      ? 'text-[#9E792B]'
+                      : 'text-gray-500'
+                  }`}
+                  onClick={() =>
+                    navigate(`/admin/validations/${item.id}`, {
+                      state: { actionType: 'view' },
+                    })
+                  }
+                />
+                <span className="absolute bottom-full mb-1 left-1/2 -translate-x-1/2 bg-black text-white text-xs px-2 py-[2px] rounded opacity-0 group-hover:opacity-100 transition">
+                  View
+                </span>
+              </div>
+            </div>
+          );
+        }
+        return value;
+      }}
+    />
+  </div>
+)}
       </div>
 
       <div className="flex justify-end px-6 pb-14 pt-6">