diff --git a/internal/bridge/settings.go b/internal/bridge/settings.go
index 04aca77e..30369986 100644
--- a/internal/bridge/settings.go
+++ b/internal/bridge/settings.go
@@ -297,8 +297,7 @@ func (bridge *Bridge) SetColorScheme(colorScheme string) error {
 // Note: it does not clear the keychain. The only entry in the keychain is the vault password,
 // which we need at next startup to decrypt the vault.
 func (bridge *Bridge) FactoryReset(ctx context.Context) {
-	useTelemetry := bridge.IsTelemetryAvailable(ctx)
-
+	useTelemetry := !bridge.GetTelemetryDisabled()
 	// Delete all the users.
 	safe.Lock(func() {
 		for _, user := range bridge.users {
diff --git a/internal/bridge/user.go b/internal/bridge/user.go
index 221bab28..000e5ccd 100644
--- a/internal/bridge/user.go
+++ b/internal/bridge/user.go
@@ -243,15 +243,13 @@ func (bridge *Bridge) LogoutUser(ctx context.Context, userID string) error {
 func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
 	logrus.WithField("userID", userID).Info("Deleting user")
 
-	useTelemetry := bridge.IsTelemetryAvailable(ctx)
-
 	return safe.LockRet(func() error {
 		if !bridge.vault.HasUser(userID) {
 			return ErrNoSuchUser
 		}
 
 		if user, ok := bridge.users[userID]; ok {
-			bridge.logoutUser(ctx, user, true, true, useTelemetry)
+			bridge.logoutUser(ctx, user, true, true, !bridge.GetTelemetryDisabled())
 		}
 
 		if err := bridge.vault.DeleteUser(userID); err != nil {
diff --git a/internal/user/config_status.go b/internal/user/config_status.go
index cae0dee2..1b3be672 100644
--- a/internal/user/config_status.go
+++ b/internal/user/config_status.go
@@ -30,7 +30,7 @@ func (user *User) SendConfigStatusSuccess(ctx context.Context) {
 		user.SendConfigStatusRecovery(ctx)
 		return
 	}
-	if !user.telemetryManager.IsTelemetryAvailable(ctx) {
+	if !user.IsTelemetryEnabled(ctx) {
 		return
 	}
 	if !user.configStatus.IsPending() {
@@ -65,7 +65,7 @@ func (user *User) SendConfigStatusAbort(ctx context.Context, withTelemetry bool)
 	if !user.configStatus.IsPending() {
 		return
 	}
-	if !withTelemetry {
+	if !withTelemetry || !user.IsTelemetryEnabled(ctx) {
 		return
 	}
 	var builder configstatus.ConfigAbortBuilder
@@ -90,7 +90,7 @@ func (user *User) SendConfigStatusRecovery(ctx context.Context) {
 		user.SendConfigStatusSuccess(ctx)
 		return
 	}
-	if !user.telemetryManager.IsTelemetryAvailable(ctx) {
+	if !user.IsTelemetryEnabled(ctx) {
 		return
 	}
 	if !user.configStatus.IsPending() {
@@ -118,7 +118,7 @@ func (user *User) SendConfigStatusRecovery(ctx context.Context) {
 }
 
 func (user *User) SendConfigStatusProgress(ctx context.Context) {
-	if !user.telemetryManager.IsTelemetryAvailable(ctx) {
+	if !user.IsTelemetryEnabled(ctx) {
 		return
 	}
 	if !user.configStatus.IsPending() {