diff --git a/packages/server/modules/activitystream/services/commitActivity.ts b/packages/server/modules/activitystream/services/commitActivity.ts
index 2ee9a43f9..bb880a46e 100644
--- a/packages/server/modules/activitystream/services/commitActivity.ts
+++ b/packages/server/modules/activitystream/services/commitActivity.ts
@@ -13,8 +13,6 @@ import {
 import { CommitRecord } from '@/modules/core/helpers/types'
 import { ProjectSubscriptions } from '@/modules/shared/utils/subscriptions'
 import { has } from 'lodash'
-import { saveActivityFactory } from '@/modules/activitystream/repositories'
-import { db } from '@/db/knex'
 import {
   AddCommitCreatedActivity,
   AddCommitDeletedActivity,
@@ -214,22 +212,21 @@ export const addCommitDeletedActivityFactory =
     ])
   }
 
-export async function addCommitReceivedActivity(params: {
-  input: CommitReceivedInput
-  userId: string
-}) {
-  const { input, userId } = params
+export const addCommitReceivedActivityFactory =
+  ({ saveActivity }: { saveActivity: SaveActivity }) =>
+  async (params: { input: CommitReceivedInput; userId: string }) => {
+    const { input, userId } = params
 
-  await saveActivityFactory({ db })({
-    streamId: input.streamId,
-    resourceType: ResourceTypes.Commit,
-    resourceId: input.commitId,
-    actionType: ActionTypes.Commit.Receive,
-    userId,
-    info: {
-      sourceApplication: input.sourceApplication,
-      message: input.message
-    },
-    message: `Commit ${input.commitId} was received by user ${userId}`
-  })
-}
+    await saveActivity({
+      streamId: input.streamId,
+      resourceType: ResourceTypes.Commit,
+      resourceId: input.commitId,
+      actionType: ActionTypes.Commit.Receive,
+      userId,
+      info: {
+        sourceApplication: input.sourceApplication,
+        message: input.message
+      },
+      message: `Commit ${input.commitId} was received by user ${userId}`
+    })
+  }
diff --git a/packages/server/modules/core/services/commit/management.ts b/packages/server/modules/core/services/commit/management.ts
index a5d9cc19a..e096c4efa 100644
--- a/packages/server/modules/core/services/commit/management.ts
+++ b/packages/server/modules/core/services/commit/management.ts
@@ -4,7 +4,8 @@ import {
   AddCommitDeletedActivity,
   AddCommitUpdatedActivity
 } from '@/modules/activitystream/domain/operations'
-import { addCommitReceivedActivity } from '@/modules/activitystream/services/commitActivity'
+import { saveActivityFactory } from '@/modules/activitystream/repositories'
+import { addCommitReceivedActivityFactory } from '@/modules/activitystream/services/commitActivity'
 import {
   GetBranchById,
   GetStreamBranchByName,
@@ -76,10 +77,12 @@ export async function markCommitReceivedAndNotify(params: {
     )
   }
 
-  await addCommitReceivedActivity({
-    input: oldInput,
-    userId
-  })
+  await addCommitReceivedActivityFactory({ saveActivity: saveActivityFactory({ db }) })(
+    {
+      input: oldInput,
+      userId
+    }
+  )
 }
 
 export const createCommitByBranchIdFactory =