diff --git a/tools/op.sh b/tools/op.sh
index e83b46b2d2..54ff8e97e9 100755
--- a/tools/op.sh
+++ b/tools/op.sh
@@ -365,6 +365,7 @@ function op_switch() {
   fi
   BRANCH="$1"
 
+  git config --replace-all remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
   git fetch "$REMOTE" "$BRANCH"
   git checkout -f FETCH_HEAD
   git checkout -B "$BRANCH" --track "$REMOTE"/"$BRANCH"