1 files changed, 6 insertions, 3 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
index 24723a8..df30da1 100644
--- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
+++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.image.js
@@ -20,7 +20,10 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
       return <div />
     }
     url = frame.url
-    captionItem = item.settings.caption_lookup[frame_id] || item
+    captionItem = item.settings.caption_lookup[frame_id]
+    if (!captionItem.short_caption) {
+      captionItem = item
+    }
     colorName = annotation.settings.inline_color || annotation.settings.color || 'white'
   } else {
     url = item.settings.display.url
@@ -51,9 +54,9 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati
     <div className="media image" onClick={e => onAnnotationClick(e, paragraph, annotation)}>
       <div className="image-container" style={style}>
         <img src={url} />
-        <div className="speaker-icon">{SpeakerIcon}</div>
+        {!annotation.settings.hide_speaker_icon && <div className="speaker-icon">{SpeakerIcon}</div>}
       </div>
-      <MediaCitation media={captionItem} />
+      {captionItem && <MediaCitation media={captionItem} />}
     </div>
   )
   // }