diff --git a/.github/workflows/nightly_release.yml b/.github/workflows/nightly_release.yml
index d2e8980d6..2c58f954b 100644
--- a/.github/workflows/nightly_release.yml
+++ b/.github/workflows/nightly_release.yml
@@ -18,6 +18,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: ImHex
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: 🌃 Check for new commits
+        run: |
+          if [ -z "$(git log nightly..HEAD --oneline)" ]; then
+            echo "No new commits since last nightly. Exiting."
+            exit 0
+          fi
 
       - name: 📜 Set version variable
         run: |
@@ -65,7 +74,7 @@ jobs:
           cd ImHex
           echo "## Nightly ${GITHUB_SHA::7} Changelog" > changelog.md
           git fetch --tags --recurse-submodules=no
-          git log tags/nightly..HEAD --oneline --no-merges --pretty=format:'* %s' >> changelog.md
+          git log nightly..HEAD --oneline --no-merges --pretty=format:'* %s' >> changelog.md
 
       - name: 📦 Update Pre-Release
         run: |
@@ -74,7 +83,7 @@ jobs:
           cd ImHex
           
           # Move nightly tag to latest commit
-          git tag -f nightly
+          git tag -f nightly HEAD
           git push origin nightly --force
 
           # Auth for GitHub CLI