diff --git a/frontend/server/git.js b/frontend/server/git.js
index da2efbef..ff708ae0 100644
--- a/frontend/server/git.js
+++ b/frontend/server/git.js
@@ -111,11 +111,15 @@ export async function ensureGitRepoAndCommitBlocks(
     await git.add({ fs, dir: cachePath, filepath: "." });
 
     // Create commit with block hashes in message
-    const commitMessage = buildContextStatuses
+    let commitMessage = buildContextStatuses
       .filter((status) => status.hash)
       .map((status) => `${status.blockKey}: ${status.hash}`)
       .join("\n");
 
+    if (!commitMessage) {
+      commitMessage = "Initial commit";
+    }
+
     await git.commit({
       fs,
       dir: cachePath,