diff --git a/Sources/Avatar.swift b/Sources/Avatar.swift
index 86d6cab5..5fdee88d 100644
--- a/Sources/Avatar.swift
+++ b/Sources/Avatar.swift
@@ -39,14 +39,13 @@ public struct Avatar {
     }
     
     public func image(highlighted: Bool) -> UIImage {
-        guard let image = image else {
-            return placeholderImage
+        
+        switch highlighted {
+        case true:
+            return highlightedImage ?? image ?? placeholderImage
+        case false:
+            return image ?? placeholderImage
         }
         
-        guard let highlightedImage = highlightedImage else {
-            return image
-        }
-        
-        return highlighted ? image : highlightedImage
     }
 }
diff --git a/Sources/MessageBubble.swift b/Sources/MessageBubble.swift
index 60471e17..1b926e59 100644
--- a/Sources/MessageBubble.swift
+++ b/Sources/MessageBubble.swift
@@ -31,6 +31,6 @@ public struct MessageBubble {
     public let highlightedImage: UIImage
     
     public func image(highlighted: Bool) -> UIImage {
-        return highlighted ? image : highlightedImage
+        return highlighted ? highlightedImage : image
     }
 }