diff --git a/packages/server/assets/core/typedefs/modelsAndVersions.graphql b/packages/server/assets/core/typedefs/modelsAndVersions.graphql
index dc3a477c6..51053d915 100644
--- a/packages/server/assets/core/typedefs/modelsAndVersions.graphql
+++ b/packages/server/assets/core/typedefs/modelsAndVersions.graphql
@@ -328,9 +328,9 @@ type ProjectVersionsUpdatedMessage {
   """
   version: Version
   """
-  Only set if version was deleted, in other scenarios can be queried from 'version'
+  Version's model ID
   """
-  modelId: String
+  modelId: String!
 }
 
 type ProjectVersionsPreviewGeneratedMessage {
diff --git a/packages/server/modules/activitystream/domain/operations.ts b/packages/server/modules/activitystream/domain/operations.ts
index 64626bee2..8bdcce5ec 100644
--- a/packages/server/modules/activitystream/domain/operations.ts
+++ b/packages/server/modules/activitystream/domain/operations.ts
@@ -233,6 +233,7 @@ export type AddCommitUpdatedActivity = (params: {
   originalCommit: CommitRecord
   update: CommitUpdateInput | UpdateVersionInput
   newCommit: CommitRecord
+  branchId: string
 }) => Promise<void>
 
 export type AddCommitMovedActivity = (params: {
diff --git a/packages/server/modules/activitystream/services/commitActivity.ts b/packages/server/modules/activitystream/services/commitActivity.ts
index af871501f..1415b8d57 100644
--- a/packages/server/modules/activitystream/services/commitActivity.ts
+++ b/packages/server/modules/activitystream/services/commitActivity.ts
@@ -68,7 +68,7 @@ export const addCommitCreatedActivityFactory =
           id: commit.id,
           version: { ...commit, streamId },
           type: ProjectVersionsUpdatedMessageType.Created,
-          modelId: null
+          modelId
         }
       })
     ])
@@ -93,8 +93,10 @@ export const addCommitUpdatedActivityFactory =
     originalCommit: CommitRecord
     update: CommitUpdateInput | UpdateVersionInput
     newCommit: CommitRecord
+    branchId: string
   }) => {
-    const { commitId, streamId, userId, originalCommit, update, newCommit } = params
+    const { commitId, streamId, userId, originalCommit, update, newCommit, branchId } =
+      params
     const legacyUpdateStruct: CommitUpdateInput = isOldVersionUpdateInput(update)
       ? update
       : {
@@ -124,7 +126,7 @@ export const addCommitUpdatedActivityFactory =
           id: commitId,
           version: { ...newCommit, streamId },
           type: ProjectVersionsUpdatedMessageType.Updated,
-          modelId: null
+          modelId: branchId
         }
       })
     ])
@@ -163,7 +165,7 @@ export const addCommitMovedActivityFactory =
           id: commitId,
           version: { ...commit, streamId },
           type: ProjectVersionsUpdatedMessageType.Updated,
-          modelId: null
+          modelId: newBranchId
         }
       })
     ])
diff --git a/packages/server/modules/core/graph/generated/graphql.ts b/packages/server/modules/core/graph/generated/graphql.ts
index f585cce06..83cb44e17 100644
--- a/packages/server/modules/core/graph/generated/graphql.ts
+++ b/packages/server/modules/core/graph/generated/graphql.ts
@@ -2472,8 +2472,8 @@ export type ProjectVersionsUpdatedMessage = {
   __typename?: 'ProjectVersionsUpdatedMessage';
   /** Version ID */
   id: Scalars['String']['output'];
-  /** Only set if version was deleted, in other scenarios can be queried from 'version' */
-  modelId?: Maybe<Scalars['String']['output']>;
+  /** Version's model ID */
+  modelId: Scalars['String']['output'];
   type: ProjectVersionsUpdatedMessageType;
   /** Null if version was deleted */
   version?: Maybe<Version>;
@@ -6132,7 +6132,7 @@ export type ProjectVersionsPreviewGeneratedMessageResolvers<ContextType = GraphQ
 
 export type ProjectVersionsUpdatedMessageResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['ProjectVersionsUpdatedMessage'] = ResolversParentTypes['ProjectVersionsUpdatedMessage']> = {
   id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
-  modelId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  modelId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   type?: Resolver<ResolversTypes['ProjectVersionsUpdatedMessageType'], ParentType, ContextType>;
   version?: Resolver<Maybe<ResolversTypes['Version']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
diff --git a/packages/server/modules/core/services/commit/management.ts b/packages/server/modules/core/services/commit/management.ts
index 79c13e20b..8d93f61aa 100644
--- a/packages/server/modules/core/services/commit/management.ts
+++ b/packages/server/modules/core/services/commit/management.ts
@@ -328,7 +328,8 @@ export const updateCommitAndNotifyFactory =
         userId,
         originalCommit: commit,
         update: params,
-        newCommit
+        newCommit,
+        branchId: branch!.id
       })
 
       const [updatedBranch] = await Promise.all([
diff --git a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
index de8862d9f..aacc53c5d 100644
--- a/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
+++ b/packages/server/modules/cross-server-sync/graph/generated/graphql.ts
@@ -2453,8 +2453,8 @@ export type ProjectVersionsUpdatedMessage = {
   __typename?: 'ProjectVersionsUpdatedMessage';
   /** Version ID */
   id: Scalars['String']['output'];
-  /** Only set if version was deleted, in other scenarios can be queried from 'version' */
-  modelId?: Maybe<Scalars['String']['output']>;
+  /** Version's model ID */
+  modelId: Scalars['String']['output'];
   type: ProjectVersionsUpdatedMessageType;
   /** Null if version was deleted */
   version?: Maybe<Version>;
diff --git a/packages/server/test/graphql/generated/graphql.ts b/packages/server/test/graphql/generated/graphql.ts
index 7a4d04b65..cf1fe3eda 100644
--- a/packages/server/test/graphql/generated/graphql.ts
+++ b/packages/server/test/graphql/generated/graphql.ts
@@ -2454,8 +2454,8 @@ export type ProjectVersionsUpdatedMessage = {
   __typename?: 'ProjectVersionsUpdatedMessage';
   /** Version ID */
   id: Scalars['String']['output'];
-  /** Only set if version was deleted, in other scenarios can be queried from 'version' */
-  modelId?: Maybe<Scalars['String']['output']>;
+  /** Version's model ID */
+  modelId: Scalars['String']['output'];
   type: ProjectVersionsUpdatedMessageType;
   /** Null if version was deleted */
   version?: Maybe<Version>;
@@ -4642,7 +4642,7 @@ export type OnUserProjectVersionsUpdatedSubscriptionVariables = Exact<{
 }>;
 
 
-export type OnUserProjectVersionsUpdatedSubscription = { __typename?: 'Subscription', projectVersionsUpdated: { __typename?: 'ProjectVersionsUpdatedMessage', id: string, type: ProjectVersionsUpdatedMessageType, modelId?: string | null, version?: { __typename?: 'Version', id: string, message?: string | null } | null } };
+export type OnUserProjectVersionsUpdatedSubscription = { __typename?: 'Subscription', projectVersionsUpdated: { __typename?: 'ProjectVersionsUpdatedMessage', id: string, type: ProjectVersionsUpdatedMessageType, modelId: string, version?: { __typename?: 'Version', id: string, message?: string | null } | null } };
 
 export type OnUserStreamCommitCreatedSubscriptionVariables = Exact<{
   streamId: Scalars['String']['input'];