diff --git a/zerver/lib/actions.py b/zerver/lib/actions.py
index 01f54dc04e..e2d5cd6a92 100644
--- a/zerver/lib/actions.py
+++ b/zerver/lib/actions.py
@@ -4677,6 +4677,7 @@ def notify_avatar_url_change(user_profile: UserProfile) -> None:
     )
 
 
+@transaction.atomic(savepoint=False)
 def do_change_avatar_fields(
     user_profile: UserProfile,
     avatar_source: str,