diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index 4c396092..a5e40328 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -502,12 +502,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
     String error;
     try {
       var repo = await GitRepository.load(repoPath);
-      var remotes = repo.config.remotes;
-      var i = remotes.indexWhere((r) => r.name == widget.remoteName);
-      if (i != -1) {
-        await repo.removeRemote(widget.remoteName);
-      }
-      await repo.addRemote(widget.remoteName, _gitCloneUrl);
+      await repo.addOrUpdateRemote(widget.remoteName, _gitCloneUrl);
 
       var repoN = git_bindings.GitRepo(folderPath: repoPath);
       await repoN.fetch(
diff --git a/pubspec.lock b/pubspec.lock
index 48c4d77f..75b2cb63 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -181,7 +181,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: b489bbb315e066b332e438747c1359004ff2b244
+      resolved-ref: "52c0358eadd2e320c845a6e5af39a84b89220a58"
       url: "https://github.com/GitJournal/dart-git.git"
     source: git
     version: "0.0.2"