diff --git a/frontend/src/component/admin/Admin.tsx b/frontend/src/component/admin/Admin.tsx
index f8ec1a544c..9ad0780bde 100644
--- a/frontend/src/component/admin/Admin.tsx
+++ b/frontend/src/component/admin/Admin.tsx
@@ -6,7 +6,7 @@ import { Billing } from './billing/Billing';
 import FlaggedBillingRedirect from './billing/FlaggedBillingRedirect/FlaggedBillingRedirect';
 import { CorsAdmin } from './cors';
 import { CreateGroup } from './groups/CreateGroup/CreateGroup';
-import { EditGroup } from './groups/EditGroup/EditGroup';
+import { EditGroupContainer } from './groups/EditGroup/EditGroup';
 import { Group } from './groups/Group/Group';
 import { GroupsAdmin } from './groups/GroupsAdmin';
 import { InstanceAdmin } from './instance-admin/InstanceAdmin';
@@ -37,7 +37,10 @@ export const Admin = () => (
             <Route path="invite-link" element={<InviteLink />} />
             <Route path="groups" element={<GroupsAdmin />} />
             <Route path="groups/create-group" element={<CreateGroup />} />
-            <Route path="groups/:groupId/edit" element={<EditGroup />} />
+            <Route
+                path="groups/:groupId/edit"
+                element={<EditGroupContainer />}
+            />
             <Route path="groups/:groupId" element={<Group />} />
             <Route path="roles" element={<ProjectRoles />} />
             <Route path="instance" element={<InstanceAdmin />} />
diff --git a/frontend/src/component/admin/groups/EditGroup/EditGroup.tsx b/frontend/src/component/admin/groups/EditGroup/EditGroup.tsx
index 7796e6fd70..a7844e36b0 100644
--- a/frontend/src/component/admin/groups/EditGroup/EditGroup.tsx
+++ b/frontend/src/component/admin/groups/EditGroup/EditGroup.tsx
@@ -13,10 +13,34 @@ import { useGroup } from 'hooks/api/getters/useGroup/useGroup';
 import { UG_SAVE_BTN_ID } from 'utils/testIds';
 import { GO_BACK } from 'constants/navigate';
 import { useGroups } from 'hooks/api/getters/useGroups/useGroups';
+import { IGroup } from 'interfaces/group';
 
-export const EditGroup = () => {
+export const EditGroupContainer = () => {
     const groupId = Number(useRequiredPathParam('groupId'));
     const { group, refetchGroup } = useGroup(groupId);
+
+    if (!group) return null;
+
+    return (
+        <EditGroup
+            group={group}
+            groupId={groupId}
+            refetchGroup={refetchGroup}
+        />
+    );
+};
+
+interface IEditGroupProps {
+    group: IGroup;
+    groupId: number;
+    refetchGroup: () => void;
+}
+
+export const EditGroup = ({
+    group,
+    groupId,
+    refetchGroup,
+}: IEditGroupProps) => {
     const { refetchGroups } = useGroups();
     const { setToastData, setToastApiError } = useToast();
     const { uiConfig } = useUiConfig();