diff --git a/packages/frontend/.lint-todo b/packages/frontend/.lint-todo
index dd7937703e..23f4d01808 100644
--- a/packages/frontend/.lint-todo
+++ b/packages/frontend/.lint-todo
@@ -4,8 +4,6 @@ add|ember-template-lint|no-at-ember-render-modifiers|5|2|5|2|23cd787c79c34a628da
 add|ember-template-lint|no-at-ember-render-modifiers|6|2|6|2|e5120f87b74c5ae8e4c76b9089e0b4a4504c6e3c|1731542400000|1762646400000|1793750400000|app/components/user-profile-roles.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|3|2|3|2|1fb0566922ce4f066916e5e2931f650f69d7cfba|1731542400000|1762646400000|1793750400000|app/components/visualizer-program-year-objectives.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|4|2|4|2|38e65b45b56fdfd4160d3b0884114b6643e3a036|1731542400000|1762646400000|1793750400000|app/components/visualizer-program-year-objectives.hbs
-add|ember-template-lint|no-at-ember-render-modifiers|10|6|10|6|d919d2af254f782c01fe2ba15416673e52e91124|1731542400000|1762646400000|1793750400000|app/components/reports/subject/new/academic-year.hbs
-add|ember-template-lint|no-at-ember-render-modifiers|11|6|11|6|940005188b476a060b0e5d3f05baea24ba178878|1731542400000|1762646400000|1793750400000|app/components/reports/subject/new/academic-year.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|10|6|10|6|d919d2af254f782c01fe2ba15416673e52e91124|1731542400000|1762646400000|1793750400000|app/components/reports/subject/new/competency.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|11|6|11|6|940005188b476a060b0e5d3f05baea24ba178878|1731542400000|1762646400000|1793750400000|app/components/reports/subject/new/competency.hbs
 add|ember-template-lint|no-at-ember-render-modifiers|10|6|10|6|d919d2af254f782c01fe2ba15416673e52e91124|1731542400000|1762646400000|1793750400000|app/components/reports/subject/new/instructor-group.hbs
diff --git a/packages/frontend/app/components/reports/new-subject.js b/packages/frontend/app/components/reports/new-subject.js
index 64d1d309f4..0f26a4153c 100644
--- a/packages/frontend/app/components/reports/new-subject.js
+++ b/packages/frontend/app/components/reports/new-subject.js
@@ -215,6 +215,8 @@ export default class ReportsNewSubjectComponent extends Component {
 
   get newPrepositionalObjectComponent() {
     switch (this.prepositionalObject) {
+      case 'academic year':
+        return ensureSafeComponent(NewAcademicYearComponent, this);
       case 'competency':
         return ensureSafeComponent(NewCompetencyComponent, this);
       case 'course':
@@ -237,8 +239,6 @@ export default class ReportsNewSubjectComponent extends Component {
         return ensureSafeComponent(NewSessionTypeComponent, this);
       case 'term':
         return ensureSafeComponent(NewTermComponent, this);
-      case 'academic year':
-        return ensureSafeComponent(NewAcademicYearComponent, this);
     }
 
     return null;
diff --git a/packages/frontend/app/components/reports/subject/new/academic-year.hbs b/packages/frontend/app/components/reports/subject/new/academic-year.hbs
index 600698027c..ac17f123e0 100644
--- a/packages/frontend/app/components/reports/subject/new/academic-year.hbs
+++ b/packages/frontend/app/components/reports/subject/new/academic-year.hbs
@@ -2,16 +2,14 @@
   <label for="new-term">
     {{t "general.whichIs"}}
   </label>
-  {{#if this.isLoaded}}
+  {{#if this.academicYearsData.isResolved}}
     <select
       id="new-academic-year"
       data-test-prepositional-objects
       {{on "change" (pick "target.value" @changeId)}}
-      {{did-insert (perform this.setInitialValue)}}
-      {{did-update (perform this.setInitialValue) @school}}
     >
       {{#each (sort-by "title" this.academicYears) as |year|}}
-        <option selected={{eq year.id @currentId}} value={{year.id}}>
+        <option selected={{eq year.id this.bestSelectedAcademicYear}} value={{year.id}}>
           {{#if this.academicYearCrossesCalendarYearBoundaries}}
             {{year.id}}
             -
diff --git a/packages/frontend/app/components/reports/subject/new/academic-year.js b/packages/frontend/app/components/reports/subject/new/academic-year.js
index a5f750fa85..3b44cd6c28 100644
--- a/packages/frontend/app/components/reports/subject/new/academic-year.js
+++ b/packages/frontend/app/components/reports/subject/new/academic-year.js
@@ -2,7 +2,6 @@ import Component from '@glimmer/component';
 import { TrackedAsyncData } from 'ember-async-data';
 import { cached } from '@glimmer/tracking';
 import { service } from '@ember/service';
-import { task, timeout } from 'ember-concurrency';
 import currentAcademicYear from 'ilios-common/utils/current-academic-year';
 
 export default class ReportsSubjectNewAcademicYearComponent extends Component {
@@ -10,36 +9,34 @@ export default class ReportsSubjectNewAcademicYearComponent extends Component {
   @service iliosConfig;
 
   @cached
-  get data() {
+  get academicYearsData() {
     return new TrackedAsyncData(this.store.findAll('academic-year'));
   }
 
-  crossesBoundaryConfig = new TrackedAsyncData(
-    this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries'),
-  );
-
-  @cached
-  get academicYearCrossesCalendarYearBoundaries() {
-    return this.crossesBoundaryConfig.isResolved ? this.crossesBoundaryConfig.value : false;
-  }
-
   get academicYears() {
-    return this.data.value;
+    return this.academicYearsData.isResolved ? this.academicYearsData.value : [];
   }
 
-  get isLoaded() {
-    return this.data.isResolved;
-  }
-
-  @task
-  *setInitialValue() {
-    yield timeout(1); //wait a moment so we can render before setting
+  get bestSelectedAcademicYear() {
     const ids = this.academicYears.map(({ id }) => id);
+
     if (ids.includes(this.args.currentId)) {
-      return;
+      return this.args.currentId;
     }
+
     const currentYear = currentAcademicYear();
     const currentYearId = this.academicYears.find(({ id }) => Number(id) === currentYear)?.id;
-    this.args.changeId(currentYearId ?? ids.at(-1));
+    const newId = currentYearId ?? ids.at(-1);
+
+    return newId;
+  }
+
+  crossesBoundaryConfig = new TrackedAsyncData(
+    this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries'),
+  );
+
+  @cached
+  get academicYearCrossesCalendarYearBoundaries() {
+    return this.crossesBoundaryConfig.isResolved ? this.crossesBoundaryConfig.value : false;
   }
 }
diff --git a/packages/frontend/tests/integration/components/reports/subject/new/academic-year-test.js b/packages/frontend/tests/integration/components/reports/subject/new/academic-year-test.js
index 927bef3038..85e71807de 100644
--- a/packages/frontend/tests/integration/components/reports/subject/new/academic-year-test.js
+++ b/packages/frontend/tests/integration/components/reports/subject/new/academic-year-test.js
@@ -25,7 +25,7 @@ module('Integration | Component | reports/subject/new/academic-year', function (
   });
 
   test('it renders', async function (assert) {
-    assert.expect(14);
+    assert.expect(12);
     this.set('currentId', null);
     this.set('changeId', (id) => {
       assert.strictEqual(id, '2060');
@@ -37,16 +37,16 @@ module('Integration | Component | reports/subject/new/academic-year', function (
   @school={{null}}
 />`);
 
-    assert.strictEqual(component.options.length, 3);
-    assert.strictEqual(component.options[0].text, '2015');
-    assert.strictEqual(component.options[1].text, '2031');
-    assert.strictEqual(component.options[2].text, '2060');
+    assert.strictEqual(component.options.length, 3, 'dropdown has 3 options');
+    assert.strictEqual(component.options[0].text, '2015', 'first option is 2015');
+    assert.strictEqual(component.options[1].text, '2031', 'second option is 2031');
+    assert.strictEqual(component.options[2].text, '2060', 'third option is 2060');
 
-    assert.strictEqual(component.value, '2060');
+    assert.strictEqual(component.value, '2060', 'selected option is 2060');
 
-    assert.notOk(component.options[0].isSelected);
-    assert.notOk(component.options[1].isSelected);
-    assert.ok(component.options[2].isSelected);
+    assert.notOk(component.options[0].isSelected, 'option 0 is not selected');
+    assert.notOk(component.options[1].isSelected, 'option 1 is not selected');
+    assert.ok(component.options[2].isSelected, 'option 2 is selected');
 
     this.set('changeId', (id) => {
       assert.strictEqual(id, '2031');
@@ -54,11 +54,10 @@ module('Integration | Component | reports/subject/new/academic-year', function (
     });
 
     this.set('currentId', '2031');
-    assert.notOk(component.options[0].isSelected);
-    assert.notOk(component.options[0].isSelected);
-    assert.ok(component.options[1].isSelected);
-    assert.notOk(component.options[2].isSelected);
-    assert.strictEqual(component.value, '2031');
+    assert.notOk(component.options[0].isSelected, 'option 0 is not selected');
+    assert.ok(component.options[1].isSelected, 'option 1 is selected');
+    assert.notOk(component.options[2].isSelected, 'option 2 is not selected');
+    assert.strictEqual(component.value, '2031', 'selected option is 2031');
   });
 
   test('it works', async function (assert) {
@@ -73,14 +72,14 @@ module('Integration | Component | reports/subject/new/academic-year', function (
       assert.strictEqual(id, '2031');
       this.set('currentId', id);
     });
-    assert.ok(component.options[0].isSelected);
-    assert.notOk(component.options[1].isSelected);
-    assert.notOk(component.options[2].isSelected);
+    assert.ok(component.options[0].isSelected, 'option 0 is selected');
+    assert.notOk(component.options[1].isSelected, 'option 1 is not selected');
+    assert.notOk(component.options[2].isSelected, 'option 2 is not selected');
 
     await component.set('2031');
-    assert.notOk(component.options[0].isSelected);
-    assert.ok(component.options[1].isSelected);
-    assert.notOk(component.options[2].isSelected);
-    assert.strictEqual(component.value, '2031');
+    assert.notOk(component.options[0].isSelected, 'option 0 is not selected');
+    assert.ok(component.options[1].isSelected, 'option 1 is selected');
+    assert.notOk(component.options[2].isSelected, 'option 2 is not selected');
+    assert.strictEqual(component.value, '2031', 'selected option is 2031');
   });
 });