diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 64e3f3d691..ca4563ba2d 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -452,7 +452,6 @@ class SettingsController extends Controller
             }
 
             if ($request->input('restore_default_avatar') == '1')  {
-                Setting::restoreDefaultAvatar();
                 $setting->default_avatar = 'default.png';
             }
         }
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 7c6d46573e..7054676a93 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -445,26 +445,30 @@ class UserPresenter extends Presenter
             return Storage::disk('public')->url('avatars/'.e($this->avatar));
         }
 
-        // If there is a default avatar
-        if (Setting::getSettings()->default_avatar!= '') {
+
+        // If the default is system default
+        if (Setting::getSettings()->default_avatar == 'default.png') {
+            return Storage::disk('public')->url('default.png');
+        }
+
+        // If there is a custom default avatar
+        if (Setting::getSettings()->default_avatar != '') {
             return Storage::disk('public')->url('avatars/'.e(Setting::getSettings()->default_avatar));
         }
 
-        // Fall back to Gravatar if the settings allow loading remote scripts
-        if (Setting::getSettings()->load_remote == '1') {
-            if ($this->model->gravatar != '') {
+        // If there is no default and no custom avatar, check for gravatar
+        if ((Setting::getSettings()->load_remote == '1') && (Setting::getSettings()->default_avatar == '')) {
 
+            if ($this->model->gravatar != '') {
                 $gravatar = md5(strtolower(trim($this->model->gravatar)));
                 return '//gravatar.com/avatar/'.$gravatar;
 
             } elseif ($this->email != '') {
-
                 $gravatar = md5(strtolower(trim($this->email)));
                 return '//gravatar.com/avatar/'.$gravatar;
             }
         }
 
-
         return false;
     }
 
diff --git a/public/uploads/avatars/default.png b/public/uploads/avatars/default.png
deleted file mode 100644
index 49aa98b55d..0000000000
Binary files a/public/uploads/avatars/default.png and /dev/null differ