diff --git a/addon/components/au-time-picker.hbs b/addon/components/au-time-picker.hbs
index fd8f1479f..1998e4d9a 100644
--- a/addon/components/au-time-picker.hbs
+++ b/addon/components/au-time-picker.hbs
@@ -9,8 +9,8 @@
         class="au-c-time-picker__input"
         name="input-hour"
         id="input-hour"
+        value={{this.hourValueFormatted}}
         data-test-autimepicker-hourinput
-        @value={{this.hourValueFormatted}}
         {{on "keyup" (fn this.timeValueKeyPress "hourValue")}}
         {{on "input" (fn this.validateTime "hourValue")}}
       />
@@ -51,8 +51,8 @@
         class="au-c-time-picker__input"
         name="input-minute"
         id="input-minute"
+        value={{this.minuteValueFormatted}}
         data-test-autimepicker-minuteinput
-        @value={{this.minuteValueFormatted}}
         {{on "keyup" (fn this.timeValueKeyPress "minuteValue")}}
         {{on "input" (fn this.validateTime "minuteValue")}}
       />
@@ -94,8 +94,8 @@
           class="au-c-time-picker__input"
           name="input-second"
           id="input-second"
+          value={{this.secondValueFormatted}}
           data-test-autimepicker-secondinput
-          @value={{this.secondValueFormatted}}
           {{on "keyup" (fn this.timeValueKeyPress "secondValue")}}
           {{on "input" (fn this.validateTime "secondValue")}}
         />
diff --git a/addon/components/au-time-picker.js b/addon/components/au-time-picker.js
index 7d625aced..fc447da23 100644
--- a/addon/components/au-time-picker.js
+++ b/addon/components/au-time-picker.js
@@ -15,6 +15,7 @@ export default class AuTimePickerComponent extends Component {
     },
   })
   hourValue = 12;
+
   @trackedReset({
     memo: 'args.minutes',
     update() {
@@ -22,6 +23,7 @@ export default class AuTimePickerComponent extends Component {
     },
   })
   minuteValue = 0;
+
   @trackedReset({
     memo: 'args.seconds',
     update() {