diff --git a/src/app/tweet-image/tweet-image.component.html b/src/app/tweet-image/tweet-image.component.html
index c8bd696..e2dd1f6 100644
--- a/src/app/tweet-image/tweet-image.component.html
+++ b/src/app/tweet-image/tweet-image.component.html
@@ -16,7 +16,7 @@
 
 <ng-container *ngIf="tweet && thumbnail">
   <span class="image-thumbnail"
-        *ngIf="tweet.extended_entities && tweet.extended_entities.media">
+        *ngIf="tweet.extended_entities?.media?.length">
     <img [class.blur]="shouldBlur"
          [src]="tweet.extended_entities.media[0].media_url" [alt]="shouldBlur ? 'Blurred image from tweet.' : 'Image from tweet.'">
   </span>
@@ -24,9 +24,9 @@
 <ng-container *ngIf="tweet && !thumbnail">
   <div class="full-image"
        [class.collapsed]="collapsed"
-       *ngIf="tweet.extended_entities && tweet.extended_entities.media">
+       *ngIf="tweet.extended_entities?.media?.length">
     <img *ngFor="let media of tweet.extended_entities.media"
-        [class.blur]="shouldBlur" 
+        [class.blur]="shouldBlur"
         [src]="media.media_url" [alt]="shouldBlur ? 'Blurred image from tweet.' : 'Image from tweet.'">
   </div>
 </ng-container>