diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index 9707c40e..868d393a 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -440,7 +440,9 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
         await GitRepository.init(repoPath);
       }
       var repo = await GitRepository.load(repoPath).getOrThrow();
-      await repo.removeRemote(widget.remoteName).throwOnError();
+      if (repo.config.remote(widget.remoteName) != null) {
+        await repo.removeRemote(widget.remoteName).throwOnError();
+      }
     } on Exception catch (e, stacktrace) {
       Log.e("Failed to remove remote", ex: e, stacktrace: stacktrace);
       logExceptionWarning(e, stacktrace);