diff --git a/internal/user/user.go b/internal/user/user.go
index 465307be..e3b8a8cb 100644
--- a/internal/user/user.go
+++ b/internal/user/user.go
@@ -284,7 +284,6 @@ func (user *User) SetAddressMode(_ context.Context, mode vault.AddressMode) erro
 
 	user.syncAbort.Abort()
 	user.pollAbort.Abort()
-	defer user.goSync()
 
 	return safe.LockRet(func() error {
 		if err := user.vault.SetAddressMode(mode); err != nil {