diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index bdb73f3433..05af683a69 100644
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -32,7 +32,8 @@ class GravatarPlugin extends Plugin
 {
     function onEndProfileGetAvatar($profile, $size, &$avatar)
     {
-        if (empty($avatar)) {
+        if (empty($avatar) || 
+            (!empty($avatar->filename) && !file_exists(Avatar::path($avatar->filename)))) {
             $user = $profile->getUser();
             if (!empty($user) && !empty($user->email)) {
                 // Fake one!