diff --git a/Riot/Modules/Common/Avatar/AvatarView.swift b/Riot/Modules/Common/Avatar/AvatarView.swift
index 7cee21d40c..a3f46a5aa7 100644
--- a/Riot/Modules/Common/Avatar/AvatarView.swift
+++ b/Riot/Modules/Common/Avatar/AvatarView.swift
@@ -143,7 +143,7 @@ class AvatarView: UIView, Themable {
     
     private func updateAvatarContentMode(contentMode: UIView.ContentMode) {
         avatarImageView?.contentMode = contentMode
-        avatarImageView?.imageView.contentMode = contentMode
+        avatarImageView?.imageView?.contentMode = contentMode
     }
         
     // MARK: - Actions