diff --git a/reviewboard/admin/forms.py b/reviewboard/admin/forms.py
index b85b08c423c8307be85a36994cf3e281f29cc333..f0dd63a4a48fd7dc02cec93bf9bf1741bed87e2d 100644
--- a/reviewboard/admin/forms.py
+++ b/reviewboard/admin/forms.py
@@ -512,9 +512,9 @@ class AvatarServicesForm(SiteSettingsForm):
             avatar_services.get('avatar_service_id', service_id)
             for service_id in self.cleaned_data['enabled_services']
         ]
+
         avatar_services.set_default_service(
-            avatar_services.get('avatar_service_id',
-                                self.cleaned_data['default_service']),
+            self.cleaned_data['default_service'],
             save=False)
 
         avatars_enabled_changed = (avatar_services.avatars_enabled !=