diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 0c2033d821..96ada2c826 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -340,6 +340,7 @@ class EmailsettingsAction extends SettingsAction
 
             if ($result === false) {
                 common_log_db_error($user, 'UPDATE', __FILE__);
+                $user->query('ROLLBACK');
                 // TRANS: Server error thrown on database error updating e-mail preferences.
                 $this->serverError(_('Could not update user.'));
             }