diff --git a/site/snippets/plg-carousel.php b/site/snippets/plg-carousel.php
index 6d4c451..188a25b 100644
--- a/site/snippets/plg-carousel.php
+++ b/site/snippets/plg-carousel.php
@@ -42,10 +42,12 @@ if (!(false==$carouselFolder) && ($carouselFolder->hasImages())) : echo $preNorm
 <?php $n=-1; foreach($carouselFolder->images()->sortBy($sort, $sdir) as $image): $n++; ?>
       <div class="carousel-item<?php if($n==0) echo ' active' ?>">
         <img src="<?php echo $image->url() ?>" alt="<?php echo $image->title()->html() ?>" />
+        <?php if(($image->heading() != "") || ($image->caption() != "")) : ?>
         <div class="carousel-caption">
-          <h3><?php echo $image->heading()->kirbytext() ?></h3>
+          <?php if($image->heading() != "") : ?><h3><?php echo $image->heading()->kirbytext() ?></h3><?php endif; ?>
           <?php echo $image->caption()->kirbytext() ?>
         </div>
+        <?php endif; ?>
       </div>
 <?php endforeach ?>
     </div>