diff --git a/src/components/GroupHistoryModal.vue b/src/components/GroupHistoryModal.vue
index d7a96d8..acf30fd 100644
--- a/src/components/GroupHistoryModal.vue
+++ b/src/components/GroupHistoryModal.vue
@@ -17,7 +17,7 @@
           <h3>{{ getTime(history.startTime) }}</h3>
           <p>{{ getDate(history.startTime) }}</p>
         </ion-label>
-        <ion-badge color="dark">{{ timeTillRun(history.endTime) }}</ion-badge>
+        <ion-badge color="dark" v-if="history.endTime">{{ timeTillRun(history.endTime) }}</ion-badge>
       </ion-item>
     </ion-list>
   </ion-content>
diff --git a/src/views/BrokeringRoute.vue b/src/views/BrokeringRoute.vue
index 30263b5..f6cc07d 100644
--- a/src/views/BrokeringRoute.vue
+++ b/src/views/BrokeringRoute.vue
@@ -81,7 +81,7 @@
                 <h3>{{ getTime(groupHistory[0].startTime) }}</h3>
                 <p>{{ getDate(groupHistory[0].startTime) }}</p>
               </ion-label>
-              <ion-badge color="dark">{{ timeTillRun(groupHistory[0].endTime) }}</ion-badge>
+              <ion-badge color="dark" v-if="groupHistory[0].endTime">{{ timeTillRun(groupHistory[0].endTime) }}</ion-badge>
             </ion-item>
           </main>
           <aside>