diff --git a/frontend/lib/api/__test__/user/group.test.ts b/frontend/lib/api/__test__/user/group.test.ts
index c663d993..ab3fdcf3 100644
--- a/frontend/lib/api/__test__/user/group.test.ts
+++ b/frontend/lib/api/__test__/user/group.test.ts
@@ -7,12 +7,16 @@ describe("first time user workflow (register, login, join group)", () => {
   test("user should be able to update group", async () => {
     const { client } = await factories.client.singleUse();
 
+    const { data: user } = await client.user.self();
     const name = faker.person.firstName();
 
-    const { response, data: group } = await client.group.update({
-      name,
-      currency: "eur",
-    });
+    const { response, data: group } = await client.group.update(
+      {
+        name,
+        currency: "eur",
+      },
+      user.item.defaultGroupId
+    );
 
     expect(response.status).toBe(200);
     expect(group.name).toBe(name);
@@ -21,7 +25,8 @@ describe("first time user workflow (register, login, join group)", () => {
   test("user should be able to get own group", async () => {
     const { client } = await factories.client.singleUse();
 
-    const { response, data: group } = await client.group.get();
+    const { data: user } = await client.user.self();
+    const { response, data: group } = await client.group.get(user.item.defaultGroupId);
 
     expect(response.status).toBe(200);
     expect(group.name).toBeTruthy();
diff --git a/frontend/lib/api/classes/group.ts b/frontend/lib/api/classes/group.ts
index a33dbf9c..4f240830 100644
--- a/frontend/lib/api/classes/group.ts
+++ b/frontend/lib/api/classes/group.ts
@@ -15,16 +15,16 @@ export class GroupApi extends BaseAPI {
     });
   }
 
-  update(data: GroupUpdate) {
+  update(data: GroupUpdate, groupId?: string) {
     return this.http.put<GroupUpdate, Group>({
-      url: route("/groups"),
+      url: route(`/groups/${groupId || ""}`),
       body: data,
     });
   }
 
-  get() {
+  get(groupId?: string) {
     return this.http.get<Group>({
-      url: route("/groups"),
+      url: route(`/groups/${groupId || ""}`),
     });
   }