diff --git a/app/services/flashes.js b/app/services/flashes.js
index 80d606748d..740f7d986b 100644
--- a/app/services/flashes.js
+++ b/app/services/flashes.js
@@ -1,6 +1,5 @@
 import { run } from '@ember/runloop';
 import Service from '@ember/service';
-import LimitedArray from 'travis/utils/limited-array';
 import { computed } from 'ember-decorators/object';
 import { alias } from 'ember-decorators/object/computed';
 import { service } from 'ember-decorators/service';
@@ -39,17 +38,14 @@ export default Service.extend({
   },
 
   setup() {
-    this.set('flashes', LimitedArray.create({
-      limit: 1,
-      content: []
-    }));
+    this.set('flashes', []);
   },
 
   @computed('flashes.[]')
   messages(flashes) {
     let model = [];
     if (flashes.length) {
-      model.pushObjects(flashes.toArray().reverse());
+      model.pushObjects(flashes.toArray());
     }
     return model.uniq();
   },
diff --git a/app/templates/components/flash-display.hbs b/app/templates/components/flash-display.hbs
index 41fc701473..4b416fab88 100644
--- a/app/templates/components/flash-display.hbs
+++ b/app/templates/components/flash-display.hbs
@@ -1,3 +1,3 @@
-{{#each messages as |flash|}}
-  {{flash-item data-test-components-flash-item flash=flash close=(action 'closeMessage')}}
-{{/each}}
+{{#if messages.firstObject}}
+  {{flash-item data-test-components-flash-item flash=messages.firstObject close=(action 'closeMessage')}}
+{{/if}}