diff --git a/resources/views/partials/incidents.blade.php b/resources/views/partials/incidents.blade.php
index 90a855c8..d7bcffc6 100644
--- a/resources/views/partials/incidents.blade.php
+++ b/resources/views/partials/incidents.blade.php
@@ -1,8 +1,8 @@
 <h4>{{ formatted_date($date) }}</h4>
 <div class="timeline">
     <div class="content-wrapper">
-        @forelse($incidents as $incidentID => $incident)
-        <div class="moment {{ $incidentID === 0 ? 'first' : null }}">
+        @forelse($incidents as $incident)
+        <div class="moment {{ $loop->first ? 'first' : null }}">
             <div class="row event clearfix">
                 <div class="col-sm-1">
                     <div class="status-icon status-{{ $incident->latest_human_status }}" data-toggle="tooltip" title="{{ $incident->latest_human_status }}" data-placement="left">
diff --git a/resources/views/single-incident.blade.php b/resources/views/single-incident.blade.php
index 69654f93..b576bccc 100644
--- a/resources/views/single-incident.blade.php
+++ b/resources/views/single-incident.blade.php
@@ -18,8 +18,8 @@
 @if($incident->updates)
 <div class="timeline">
     <div class="content-wrapper">
-        @foreach ($incident->updates as $index => $update)
-        <div class="moment {{ $index === 0 ? 'first' : null }}" id="update-{{ $update->id }}">
+        @foreach ($incident->updates as $update)
+        <div class="moment {{ $loop->first ? 'first' : null }}" id="update-{{ $update->id }}">
             <div class="row event clearfix">
                 <div class="col-sm-1">
                     <div class="status-icon status-{{ $update->status }}" data-toggle="tooltip" title="{{ $update->human_status }}" data-placement="left">