diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 75d5d07b8..e00a26648 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -276,6 +276,9 @@ jobs:
   deploy-done:
     needs:
       - output-prev-version
+      - build-web
+      - build-admin
+      - build-mobile
       - build-frontend-image
       - build-server-image
       - deploy
diff --git a/tools/changelog/index.js b/tools/changelog/index.js
index 843131567..44b83edb1 100644
--- a/tools/changelog/index.js
+++ b/tools/changelog/index.js
@@ -49,6 +49,12 @@ async function getChangeLog(repo, previousCommit, currentCommit) {
 
   if (currentCommit) {
     const commit = repo.findCommit(currentCommit);
+    if (!commit) {
+      console.log(
+        `Current commit ${currentCommit} not found in ${repo.path()}`
+      );
+      return '';
+    }
     revWalk.push(commit.id());
   } else {
     revWalk.pushHead();