diff --git a/loop/agent.go b/loop/agent.go
index c369603..3326942 100644
--- a/loop/agent.go
+++ b/loop/agent.go
@@ -1005,6 +1005,11 @@
 	ctx := a.config.Context
 	slog.InfoContext(ctx, "agent initializing")
 
+	if !ini.NoGit {
+		// Capture the original origin before we potentially replace it below
+		a.gitOrigin = getGitOrigin(ctx, a.workingDir)
+	}
+
 	// If a remote git addr was specified, we configure the origin remote
 	if a.gitState.gitRemoteAddr != "" {
 		slog.InfoContext(ctx, "Configuring git remote", slog.String("remote", a.gitState.gitRemoteAddr))
@@ -1106,7 +1111,6 @@
 		}
 		a.codereview = codereview
 
-		a.gitOrigin = getGitOrigin(ctx, a.workingDir)
 	}
 	a.gitState.lastHEAD = a.SketchGitBase()
 	a.convo = a.initConvo()