diff --git a/server/server/server.go b/server/server/server.go
index ed3c62f..012f9d4 100644
--- a/server/server/server.go
+++ b/server/server/server.go
@@ -166,8 +166,14 @@
 		return fmt.Errorf("failed to get git status: %w", err)
 	}
 
+	// Get current branch name
+	currentBranch, err := gitRepo.GetCurrentBranch(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to get current branch: %w", err)
+	}
+
 	a.logger.Info("Current git status",
-		slog.String("branch", status.Branch),
+		slog.String("branch", currentBranch),
 		slog.Bool("isClean", status.IsClean),
 		slog.Int("stagedFiles", len(status.Staged)),
 		slog.Int("unstagedFiles", len(status.Unstaged)),
@@ -212,14 +218,14 @@
 			return fmt.Errorf("failed to commit local changes: %w", err)
 		}
 
-		if err := gitRepo.Push(ctx, "origin", status.Branch, git.PushOptions{}); err != nil {
+		if err := gitRepo.Push(ctx, "origin", currentBranch, git.PushOptions{}); err != nil {
 			return fmt.Errorf("failed to push local changes: %w", err)
 		}
 	}
 
 	// Pull latest changes from remote
 	a.logger.Info("Pulling latest changes from remote")
-	if err := gitRepo.Pull(ctx, "origin", status.Branch); err != nil {
+	if err := gitRepo.Pull(ctx, "origin", currentBranch); err != nil {
 		return fmt.Errorf("failed to pull from remote: %w", err)
 	}