diff --git a/src/listeners/general/GitListener.ts b/src/listeners/general/GitListener.ts
index 8c7fc7b6..77b1c698 100644
--- a/src/listeners/general/GitListener.ts
+++ b/src/listeners/general/GitListener.ts
@@ -386,7 +386,7 @@ export class GitListener {
       return;
     }
 
-    this.sendRequest(command, requestId, GitListener.repository?.state?.HEAD.name);
+    this.sendRequest(command, requestId, GitListener.repository?.state?.HEAD?.name);
   }
 
   private static listenToRepo(repositories: GitRepository[] | undefined) {
@@ -415,7 +415,7 @@ export class GitListener {
    */
   private static async triggerBranchChange(repo: GitRepository | null) {
     if (repo && repo.state) {
-      if (repo.state.HEAD.name !== GitListener.branchName) {
+      if (repo.state?.HEAD?.name && repo.state.HEAD.name !== GitListener.branchName) {
         GitListener.branchName = repo.state.HEAD.name;
         GitListener.repository = repo;
 
diff --git a/src/models/GitRepository.ts b/src/models/GitRepository.ts
index 0cb40ddc..704b51b4 100644
--- a/src/models/GitRepository.ts
+++ b/src/models/GitRepository.ts
@@ -14,13 +14,13 @@ export interface GitRepository {
 }
 
 export interface GitRepositoryState {
-  HEAD: GitBranch;
+  HEAD?: GitBranch;
   onDidChange: Event<void>;
 }
 
 export interface GitBranch {
   type: number;
-  name: string;
+  name?: string;
   upstream: Upstream;
   commit: string;
   ahead: number;