diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
index 11349c0c0c..2031b70fa9 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java
@@ -17,6 +17,7 @@ import lombok.ToString;
 import lombok.experimental.FieldNameConstants;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
 import java.time.Instant;
@@ -272,6 +273,15 @@ public class Application extends BaseDomain implements Artifact {
         }
     }
 
+    @Override
+    public String getBaseId() {
+        if (this.getGitArtifactMetadata() != null
+                && StringUtils.hasLength(this.getGitArtifactMetadata().getDefaultArtifactId())) {
+            return this.getGitArtifactMetadata().getDefaultArtifactId();
+        }
+        return Artifact.super.getBaseId();
+    }
+
     @JsonView(Views.Internal.class)
     @Override
     public GitArtifactMetadata getGitArtifactMetadata() {
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ArtifactCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ArtifactCE.java
index 1861056e6c..3cd3996d4a 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ArtifactCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/ArtifactCE.java
@@ -1,8 +1,10 @@
 package com.appsmith.server.domains.ce;
 
 import com.appsmith.external.models.Policy;
+import com.appsmith.external.views.Views;
 import com.appsmith.server.constants.ArtifactType;
 import com.appsmith.server.domains.GitArtifactMetadata;
+import com.fasterxml.jackson.annotation.JsonView;
 
 import java.util.Set;
 
@@ -10,6 +12,11 @@ public interface ArtifactCE {
 
     String getId();
 
+    @JsonView(Views.Internal.class)
+    default String getBaseId() {
+        return getId();
+    }
+
     String getName();
 
     String getWorkspaceId();