diff --git a/TODO.md b/TODO.md
index 74a4ca8f..5f609771 100644
--- a/TODO.md
+++ b/TODO.md
@@ -19,6 +19,7 @@
   - EventLink
     - Special treatment for matrix.to URLs?
   - EventFile & Downloading (right click on media > save as...)
+  - Prevent using upload keybinds in rooms with no perms
 
 - Refactoring
   - Use a singleton for utils.js
diff --git a/src/qml/Base/HAvatar.qml b/src/qml/Base/HAvatar.qml
index 6e25fd0f..f667f106 100644
--- a/src/qml/Base/HAvatar.qml
+++ b/src/qml/Base/HAvatar.qml
@@ -57,7 +57,9 @@ Rectangle {
 
         HToolTip {
             id: avatarToolTip
-            visible: (toolTipSourceOverride || toolTipMxc) &&
+            visible: ! avatarImage.broken &&
+                     avatarImage.status !== Image.Error &&
+                     (toolTipSourceOverride || toolTipMxc) &&
                      hoverHandler.hovered
             delay: 1000
             backgroundColor: theme.controls.avatar.hoveredImage.background