diff --git a/packages/ember/tests/acceptance/sentry-performance-test.js b/packages/ember/tests/acceptance/sentry-performance-test.js
index 892d4d0992c3..136932f77a12 100644
--- a/packages/ember/tests/acceptance/sentry-performance-test.js
+++ b/packages/ember/tests/acceptance/sentry-performance-test.js
@@ -30,11 +30,11 @@ function assertSentryCall(assert, callNumber, options) {
 
     // FIXME: For some reason, the last `afterRender` and `destroy` run queue event are not always called.
     //        This is not a blocker, but should be investigated and fixed, as this is the expected output.
-    if (event.spans[event.spans.length - 1] !== 'ember.runloop.afterRender | undefined') {
-      event.spans.push('ember.runloop.afterRender | undefined');
-    }
-    if (event.spans[event.spans.length - 1] !== 'ember.runloop.destroy | undefined') {
+    const lastSpan = event.spans[event.spans.length - 1];
+    if (lastSpan === 'ember.runloop.afterRender | undefined') {
       event.spans.push('ember.runloop.destroy | undefined');
+    } else if (lastSpan === 'ember.runloop.render | undefined') {
+      event.spans.push('ember.runloop.afterRender | undefined', 'ember.runloop.destroy | undefined');
     }
 
     assert.deepEqual(event.spans, options.spans, `Has correct spans`);