diff --git a/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
index 669be471c..21582805c 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
@@ -335,7 +335,12 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
               })}
           </TBody>
         </Table>
-        {groups?.length === 0 && <EmptyState title="No groups found" icon={faUsers} />}
+        {filteredGroups?.length === 0 && (
+          <EmptyState
+            title={groups?.length === 0 ? "No groups found" : "No groups match search"}
+            icon={faUsers}
+          />
+        )}
       </TableContainer>
     </div>
   );
diff --git a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
index 35758f9ce..ae879e88c 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -377,7 +377,14 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
           </TBody>
         </Table>
         {!isLoading && filterdUser?.length === 0 && (
-          <EmptyState title="No organization members found" icon={faUsers} />
+          <EmptyState
+            title={
+              members?.length === 0
+                ? "No organization members found"
+                : "No organization members match search"
+            }
+            icon={faUsers}
+          />
         )}
       </TableContainer>
     </div>