diff --git a/server/src/interfaces/session.interface.ts b/server/src/interfaces/session.interface.ts
index 3e2c9574a4..62c2ecec7b 100644
--- a/server/src/interfaces/session.interface.ts
+++ b/server/src/interfaces/session.interface.ts
@@ -2,10 +2,12 @@ import { SessionEntity } from 'src/entities/session.entity';
 
 export const ISessionRepository = 'ISessionRepository';
 
+type E = SessionEntity;
+
 export interface ISessionRepository {
-  create(dto: Partial<SessionEntity>): Promise<SessionEntity>;
-  update(dto: Partial<SessionEntity>): Promise<SessionEntity>;
+  create<T extends Partial<E>>(dto: T): Promise<T>;
+  update<T extends Partial<E>>(dto: T): Promise<T>;
   delete(id: string): Promise<void>;
-  getByToken(token: string): Promise<SessionEntity | null>;
-  getByUserId(userId: string): Promise<SessionEntity[]>;
+  getByToken(token: string): Promise<E | null>;
+  getByUserId(userId: string): Promise<E[]>;
 }
diff --git a/server/src/repositories/session.repository.ts b/server/src/repositories/session.repository.ts
index 5e42039bc6..ed2da7a05f 100644
--- a/server/src/repositories/session.repository.ts
+++ b/server/src/repositories/session.repository.ts
@@ -31,12 +31,12 @@ export class SessionRepository implements ISessionRepository {
     });
   }
 
-  create(session: Partial<SessionEntity>): Promise<SessionEntity> {
-    return this.repository.save(session);
+  create<T extends Partial<SessionEntity>>(dto: T): Promise<T & { id: string }> {
+    return this.repository.save(dto);
   }
 
-  update(session: Partial<SessionEntity>): Promise<SessionEntity> {
-    return this.repository.save(session);
+  update<T extends Partial<SessionEntity>>(dto: T): Promise<T> {
+    return this.repository.save(dto);
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
diff --git a/server/test/repositories/session.repository.mock.ts b/server/test/repositories/session.repository.mock.ts
index 1a034e79f0..d510eb53f7 100644
--- a/server/test/repositories/session.repository.mock.ts
+++ b/server/test/repositories/session.repository.mock.ts
@@ -3,8 +3,8 @@ import { Mocked, vitest } from 'vitest';
 
 export const newSessionRepositoryMock = (): Mocked<ISessionRepository> => {
   return {
-    create: vitest.fn(),
-    update: vitest.fn(),
+    create: vitest.fn() as any,
+    update: vitest.fn() as any,
     delete: vitest.fn(),
     getByToken: vitest.fn(),
     getByUserId: vitest.fn(),