diff --git a/resources/views/widgets/orbitSlider/element.blade.php b/resources/views/widgets/orbitSlider/element.blade.php
index c56f7aa6..c83a0342 100644
--- a/resources/views/widgets/orbitSlider/element.blade.php
+++ b/resources/views/widgets/orbitSlider/element.blade.php
@@ -1,43 +1,48 @@
-<div class="orbit {{$settings->sliderClass}}" role="region" data-orbit>
-    <ul class="orbit-container">
-        <button class="orbit-previous" aria-label="previous">
-            <span class="show-for-sr">Previous Slide</span>
-            <i class="fa fa-fw fa-2x fa-chevron-left"></i>
-        </button>
-        <button class="orbit-next" aria-label="next">
-            <span class="show-for-sr">Next Slide</span>
-            <i class="fa fa-fw fa-2x fa-chevron-right"></i>
-        </button>
+@if (!empty($images))
+    <div class="orbit {{$settings->sliderClass}}" role="region" data-orbit>
+        <ul class="orbit-container">
+            <button class="orbit-previous" aria-label="previous">
+                <span class="show-for-sr">Previous Slide</span>
+                <i class="fa fa-fw fa-2x fa-chevron-left"></i>
+            </button>
+            <button class="orbit-next" aria-label="next">
+                <span class="show-for-sr">Next Slide</span>
+                <i class="fa fa-fw fa-2x fa-chevron-right"></i>
+            </button>
 
-        @if ($settings->imagePerSlide == 'fullscreen')
-            @foreach($images as $i => $image)
-                <li class="orbit-slide {{$settings->slideContainerClass}} @if($i == 0)is-active @endif">
-                    <h2>{{$image->name}}</h2>
-                    <h3>{{$image->description}}</h3>
-                    <div class="img"
-                         style="background-image: url({{config('app.upload_url')}}/{{$image->filename}})"></div>
-                </li>
-            @endforeach
-        @else
-            @for($i = 0; $i < $slidesCount; $i++)
-                <li class="orbit-slide row {{$settings->slideContainerClass}} @if($i == 0)is-active @endif">
-                    @for ($j = 0; $j < $settings->imagePerSlide; $j++)
-                        <div class="column medium-{{$gridNumber}}">
-                            <img src="{{config('app.upload_url')}}/{{$images[$j]->filename}}" />
-                        </div>
-                    @endfor
-                </li>
-            @endfor
+            @if ($settings->imagePerSlide == 'fullscreen')
+                @foreach($images as $i => $image)
+                    <li class="orbit-slide {{$settings->slideContainerClass}} @if($i == 0)is-active @endif">
+                        <h2>{{$image->name}}</h2>
+                        <h3>{{$image->description}}</h3>
+                        <div class="img"
+                             style="background-image: url({{config('app.upload_url')}}/{{$image->filename}})"></div>
+                    </li>
+                @endforeach
+            @else
+                @for($i = 0; $i < $slidesCount; $i++)
+                    <li class="orbit-slide row {{$settings->slideContainerClass}} @if($i == 0)is-active @endif">
+                        @for ($j = 0; $j < $settings->imagePerSlide; $j++)
+                            @if (!isset($images[$i*$settings->imagePerSlide + $j]))
+                                @break
+                            @endif
+                            <div class="column medium-{{$gridNumber}}">
+                                <img src="{{config('app.upload_url')}}/{{$images[$i*$settings->imagePerSlide + $j]->filename}}" />
+                            </div>
+                        @endfor
+                    </li>
+                @endfor
+            @endif
+        </ul>
+
+        @if ($settings->displayBullets)
+            <nav class="orbit-bullets">
+                @for($i = 0; $i < $slidesCount; $i++)
+                    <button @if($i == 0) class="is-active" @endif data-slide="{{$i}}"></button>
+                @endfor
+            </nav>
         @endif
-    </ul>
 
-    @if ($settings->displayBullets)
-        <nav class="orbit-bullets">
-            @for($i = 0; $i < $slidesCount; $i++)
-                <button @if($i == 0) class="is-active" @endif data-slide="{{$i}}"></button>
-            @endfor
-        </nav>
-    @endif
-
-    {!! $settings->code !!}
-</div>
\ No newline at end of file
+        {!! $settings->code !!}
+    </div>
+@endif