diff --git a/avatar.js b/avatar.js
index 084d0dbf0..3a18edb9d 100644
--- a/avatar.js
+++ b/avatar.js
@@ -129,7 +129,7 @@ var Avatar = (function(my) {
     }
 
     function getGravatarUrl(id, size) {
-        if(id === connection.emuc.myroomjid) {
+        if(id === connection.emuc.myroomjid || !id) {
             id = SettingsMenu.getUID();
         }
         return 'https://www.gravatar.com/avatar/' +