diff --git a/packages/server/modules/core/graph/resolvers/versions.ts b/packages/server/modules/core/graph/resolvers/versions.ts
index b11f7e954..66f8a5b6c 100644
--- a/packages/server/modules/core/graph/resolvers/versions.ts
+++ b/packages/server/modules/core/graph/resolvers/versions.ts
@@ -56,8 +56,19 @@ import { GraphQLResolveInfo } from 'graphql'
 
 const { FF_FORCE_PERSONAL_PROJECTS_LIMITS_ENABLED } = getFeatureFlags()
 
-const isVersionForModel = (info: GraphQLResolveInfo) =>
-  info.path.prev?.prev?.prev?.typename === 'Model'
+/**
+ * Simple utility to check if version is inside a Model or a Project
+ */
+const getTypeFromPath = (info: GraphQLResolveInfo): 'Model' | 'Project' | null => {
+  let currentPath = info.path
+  while (currentPath) {
+    if (currentPath.typename === 'Model' || currentPath.typename === 'Project') {
+      return currentPath.typename
+    }
+    currentPath = currentPath.prev!
+  }
+  return null
+}
 
 export = {
   Project: {
@@ -121,7 +132,7 @@ export = {
         getWorkspaceLimits: ctx.authLoaders.getWorkspaceLimits
       })
       let lastVersion: Version | null
-      if (isVersionForModel(info)) {
+      if (getTypeFromPath(info) === 'Model') {
         lastVersion = await ctx.loaders
           .forRegion({ db: projectDB })
           .branches.getLatestCommit.load(parent.branchId)
diff --git a/packages/server/modules/core/tests/unit/services/versions.spec.ts b/packages/server/modules/core/tests/unit/services/versions.spec.ts
index f74b51f43..b9d3fe21f 100644
--- a/packages/server/modules/core/tests/unit/services/versions.spec.ts
+++ b/packages/server/modules/core/tests/unit/services/versions.spec.ts
@@ -37,8 +37,8 @@ describe('Module @core', () => {
             })({ workspaceId })
           )
             ?.toISOString()
-            .slice(-5)
-        ).to.eq(dayjs().subtract(1, 'month').toDate().toISOString().slice(-5))
+            .slice(0, -5)
+        ).to.eq(dayjs().subtract(1, 'month').toDate().toISOString().slice(0, -5))
       })
     })
     describe('getLimitedReferencedObjectFactory returns a function that, ', () => {