diff --git a/gajim/gtk/tooltips.py b/gajim/gtk/tooltips.py
index 1fbaee11f2e8970b375cbe415ead71512876b0fd..47eed8189321b7826ae76a4947cefea762798917 100644
--- a/gajim/gtk/tooltips.py
+++ b/gajim/gtk/tooltips.py
@@ -449,10 +449,9 @@ class RosterTooltip(StatusTable):
         scale = self._ui.tooltip_grid.get_scale_factor()
         surface = app.contacts.get_avatar(
             account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale)
-        if surface is None:
-            return
-        self._ui.avatar.set_from_surface(surface)
-        self._ui.avatar.show()
+        if surface is not None:
+            self._ui.avatar.set_from_surface(surface)
+            self._ui.avatar.show()
 
         app.plugin_manager.gui_extension_point(
             'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid)