diff --git a/src/pages/AddWorkspace/useForm.ts b/src/pages/AddWorkspace/useForm.ts
index 6746cb38..ead88e50 100644
--- a/src/pages/AddWorkspace/useForm.ts
+++ b/src/pages/AddWorkspace/useForm.ts
@@ -106,7 +106,6 @@ export function useWikiWorkspaceForm() {
   }, [mainWikiToLink]);
   const [gitRepoUrl, gitRepoUrlSetter] = useState<string>('');
 
-  // FIXME: on dev, this will get TiddlyGit 's remote repo
   useEffect(() => {
     void (async function getWorkspaceRemoteEffect(): Promise<void> {
       if (existedWikiFolderPath !== undefined) {
diff --git a/src/services/git/index.ts b/src/services/git/index.ts
index e0e2d4d9..85a9e5e3 100644
--- a/src/services/git/index.ts
+++ b/src/services/git/index.ts
@@ -47,8 +47,10 @@ export class Git implements IGitService {
 
   public debounceCommitAndSync: (wikiFolderPath: string, remoteUrl: string, userInfo: IGitUserInfos) => Promise<void> | undefined;
 
-  public async getWorkspacesRemote(wikiFolderPath: string): Promise<string> {
-    return await getRemoteUrl(wikiFolderPath);
+  public async getWorkspacesRemote(wikiFolderPath: string): Promise<string | undefined> {
+    if (await hasGit(wikiFolderPath)) {
+      return await getRemoteUrl(wikiFolderPath);
+    }
   }
 
   public async getModifiedFileList(wikiFolderPath: string): Promise<ModifiedFileList[]> {
diff --git a/src/services/git/interface.ts b/src/services/git/interface.ts
index 6eecdc0a..bd12df24 100644
--- a/src/services/git/interface.ts
+++ b/src/services/git/interface.ts
@@ -37,8 +37,8 @@ export interface IGitService {
   initWikiGit(wikiFolderPath: string, isSyncedWiki: true, remoteUrl: string, userInfo: IGitUserInfos): Promise<void>;
   initWikiGit(wikiFolderPath: string, isSyncedWiki?: false): Promise<void>;
   commitAndSync(wikiFolderPath: string, remoteUrl: string, userInfo: IGitUserInfos): Promise<void>;
-  /** Inspect git's remote url from folder's .git config */
-  getWorkspacesRemote(wikiFolderPath: string): Promise<string>;
+  /** Inspect git's remote url from folder's .git config, return undefined if there is no initialized git */
+  getWorkspacesRemote(wikiFolderPath: string): Promise<string | undefined>;
   clone(remoteUrl: string, repoFolderPath: string, userInfo: IGitUserInfos): Promise<void>;
 }
 export const GitServiceIPCDescriptor = {