diff --git a/packages/backend/src/resolvers.ts b/packages/backend/src/resolvers.ts
index a34c5f58..404dd239 100644
--- a/packages/backend/src/resolvers.ts
+++ b/packages/backend/src/resolvers.ts
@@ -38,7 +38,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
       },
 
       deployments: async (_: any, { projectId }: { projectId: string }) => {
-        return service.getDeploymentsByProjectId(projectId);
+        return service.getCommitDeploymentsByProjectId(projectId);
       },
 
       environmentVariables: async (
diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts
index 98bd9d96..7a6eaad9 100644
--- a/packages/backend/src/service.ts
+++ b/packages/backend/src/service.ts
@@ -237,21 +237,19 @@ export class Service {
           }
         });
 
-        if (!oldDNSDeployment) {
-          return;
-        }
+        if (oldDNSDeployment) {
+          // Delete previous DNS deployment
+          await this.db.deleteDeploymentById(oldDNSDeployment.id);
 
-        // Delete previous DNS deployment
-        await this.db.deleteDeploymentById(oldDNSDeployment.id);
+          // Update domain after the previous DNS deployment is deleted due to unique key constraint for domain
+          // Set the domain for the new current DNS deployment to either the domain of the previous deployment if present
+          // Or to the custom domain that was added for that project
+          const domain = oldDNSDeployment.domain
+            || await this.db.getOldestDomainByProjectId(deployment.project.id);
 
-        // Update domain after the previous DNS deployment is deleted due to unique key constraint for domain
-        // Set the domain for the new current DNS deployment to either the domain of the previous deployment if present
-        // Or to the custom domain that was added for that project
-        const domain = oldDNSDeployment.domain
-          || await this.db.getOldestDomainByProjectId(deployment.project.id);
-
-        if (domain) {
-          await this.db.updateDeploymentById(deployment.id, { domain });
+          if (domain) {
+            await this.db.updateDeploymentById(deployment.id, { domain });
+          }
         }
       }
 
@@ -483,14 +481,14 @@ export class Service {
     return dbProjects;
   }
 
-  async getDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
-    const dbDeployments = await this.db.getCommitDeploymentsByProjectId(projectId);
-    return dbDeployments;
+  async getCommitDeploymentsByProjectId(projectId: string): Promise<Deployment[]> {
+    const commitDeployments = await this.db.getCommitDeploymentsByProjectId(projectId);
+    return commitDeployments;
   }
 
   async getLatestDNSDataByProjectId(projectId: string): Promise<DNSRecordAttributes | null> {
-    const dbDeployments = await this.db.getLatestDNSDataByProjectId(projectId);
-    return dbDeployments;
+    const dnsDeployments = await this.db.getLatestDNSDataByProjectId(projectId);
+    return dnsDeployments;
   }
 
   async getEnvironmentVariablesByProjectId(