diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 0d048c0e44..534bd07481 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -1382,7 +1382,7 @@ export function Workspace() {
                     className="btn btn-sm btn-light d-inline-block border border-dark form-control h-100 p-0 pl-2 pr-2 text-dark"
                     icon={null}
                   >
-                    {global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : currentBranch.name || '-none-'}
+                    {global.fs.browser.isRequestingCloning ? <i className="fad fa-spinner fa-spin"></i> : (currentBranch && currentBranch.name) || '-none-'}
                   </Dropdown.Toggle>
                   <Dropdown.Menu as={CustomMenu} className="custom-dropdown-items branches-dropdown">
                     <div data-id="custom-dropdown-menu">
@@ -1421,8 +1421,8 @@ export function Workspace() {
                                 }}
                                 title={intl.formatMessage({ id: `filePanel.switchToBranch${branch.remote ? 'Title1' : 'Title2'}` })}
                               >
-                                <div data-id={`workspaceGit-${branch.remote ? `${branch.remote}/${branch.name}` : branch.name}`}>
-                                  {currentBranch.name === branch.name && !branch.remote ? (
+                                <div data-id={`workspaceGit-${branch.remote ? `${branch.remote.name}/${branch.name}` : branch.name}`}>
+                                  {currentBranch && currentBranch.name === branch.name && !branch.remote ? (
                                     <span>
                                       &#10003; <i className="far fa-code-branch"></i>
                                       <span className="pl-1">{branch.name}</span>
@@ -1430,7 +1430,7 @@ export function Workspace() {
                                   ) : (
                                     <span className="pl-3">
                                       <i className={`far ${branch.remote ? 'fa-cloud' : 'fa-code-branch'}`}></i>
-                                      <span className="pl-1">{branch.remote ? `${branch.remote}/${branch.name}` : branch.name}</span>
+                                      <span className="pl-1">{branch.remote ? `${branch.remote.name}/${branch.name}` : branch.name}</span>
                                     </span>
                                   )}
                                 </div>
@@ -1442,7 +1442,7 @@ export function Workspace() {
                             <div className="pl-1 pr-1" data-id="workspaceGitCreateNewBranch">
                               <i className="fas fa-code-branch pr-2"></i>
                               <span>
-                                <FormattedMessage id="filePanel.createBranch" />: {branchFilter} from '{currentBranch.name}'
+                                <FormattedMessage id="filePanel.createBranch" />: {branchFilter} from '{currentBranch && currentBranch.name}'
                               </span>
                             </div>
                           </Dropdown.Item>