diff --git a/client/components/open/forms/FormTimer.vue b/client/components/open/forms/FormTimer.vue
index 0b1fe5c6..3a0d0fb2 100644
--- a/client/components/open/forms/FormTimer.vue
+++ b/client/components/open/forms/FormTimer.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from 'vue'
 import { pendingSubmission as pendingSubmissionFun } from "~/composables/forms/pendingSubmission.js"
 
 const props = defineProps({
@@ -9,7 +8,7 @@ const props = defineProps({
 const pendingSubmission = pendingSubmissionFun(props.form)
 const startTime = ref(null)
 const completionTime = ref(parseInt(pendingSubmission.getTimer() ?? null))
-let timer = null
+const timer = ref(null)
 
 watch(() => completionTime.value, () => {
   if (completionTime.value) {
@@ -21,16 +20,16 @@ const startTimer = () => {
   if (!startTime.value) {
     startTime.value = parseInt(pendingSubmission.getTimer() ?? 1)
     completionTime.value = startTime.value
-    timer = setInterval(() => {
+    timer.value = setInterval(() => {
       completionTime.value += 1
     }, 1000)
   }
 }
 
 const stopTimer = () => {
-  if (timer) {
-    clearInterval(timer)
-    timer = null
+  if (timer.value) {
+    clearInterval(timer.value)
+    timer.value = null
     startTime.value = null
   }
 }
@@ -40,17 +39,9 @@ const resetTimer = () => {
   completionTime.value = null
 }
 
-onMounted(() => {
-  document.addEventListener('input', startTimer)
-})
-
-onUnmounted(() => {
-  document.removeEventListener('input', startTimer)
-  stopTimer()
-})
-
 defineExpose({
   completionTime,
+  startTimer,
   stopTimer,
   resetTimer
 })
diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue
index 33f02324..8e47be86 100644
--- a/client/components/open/forms/OpenCompleteForm.vue
+++ b/client/components/open/forms/OpenCompleteForm.vue
@@ -4,11 +4,6 @@
     class="open-complete-form"
     :style="{ '--font-family': form.font_family }"
   >
-    <FormTimer
-      ref="formTimer"
-      :form="form"
-    />
-
     <link
       v-if="adminPreview && form.font_family"
       rel="stylesheet"
@@ -205,7 +200,6 @@
 <script>
 import OpenForm from './OpenForm.vue'
 import OpenFormButton from './OpenFormButton.vue'
-import FormTimer from './FormTimer.vue'
 import VButton from '~/components/global/VButton.vue'
 import FormCleanings from '../../pages/forms/show/FormCleanings.vue'
 import VTransition from '~/components/global/transitions/VTransition.vue'
@@ -214,7 +208,7 @@ import clonedeep from "clone-deep"
 import ThemeBuilder from "~/lib/forms/themes/ThemeBuilder.js"
 
 export default {
-  components: { VTransition, VButton, OpenFormButton, OpenForm, FormCleanings, FormTimer },
+  components: { VTransition, VButton, OpenFormButton, OpenForm, FormCleanings },
 
   props: {
     form: { type: Object, required: true },
@@ -281,14 +275,7 @@ export default {
       if (form.busy) return
       this.loading = true
 
-      // Stop the timer and get the completion time
-      this.$refs.formTimer.stopTimer()
-      const completionTime = this.$refs.formTimer.completionTime
-      form.completion_time = completionTime
-
-      // this.closeAlert()
-      form.post('/forms/' + this.form.slug + '/answer')
-      .then((data) => {
+      form.post('/forms/' + this.form.slug + '/answer').then((data) => {
         useAmplitude().logEvent('form_submission', {
           workspace_id: this.form.workspace_id,
           form_id: this.form.id
@@ -302,7 +289,7 @@ export default {
             redirect_target_url: (this.form.is_pro && data.redirect && data.redirect_url) ? data.redirect_url : null
           },
           submission_data: form.data(),
-          completion_time: completionTime
+          completion_time: form['completion_time']
         })
 
         if (this.isIframe) {
@@ -334,14 +321,12 @@ export default {
           useAlert().error(error.data.message)
         }
         this.loading = false
-        this.$refs.formTimer.startTimer()
         onFailure()
       })
     },
     restart () {
       this.submitted = false
       this.$emit('restarted', true)
-      this.$refs.formTimer.resetTimer() // Reset the timer
     },
     passwordEntered () {
       if (this.passwordForm.password !== '' && this.passwordForm.password !== null) {
diff --git a/client/components/open/forms/OpenForm.vue b/client/components/open/forms/OpenForm.vue
index f2ef896f..93192ab3 100644
--- a/client/components/open/forms/OpenForm.vue
+++ b/client/components/open/forms/OpenForm.vue
@@ -9,6 +9,10 @@
     :style="computedStyle"
     @submit.prevent=""
   >
+    <FormTimer
+      ref="form-timer"
+      :form="form"
+    />
     <template v-if="form.show_progress_bar">
       <div
         v-if="isIframe"
@@ -134,10 +138,11 @@ import {pendingSubmission} from "~/composables/forms/pendingSubmission.js"
 import FormLogicPropertyResolver from "~/lib/forms/FormLogicPropertyResolver.js"
 import {computed} from "vue"
 import CachedDefaultTheme from "~/lib/forms/themes/CachedDefaultTheme.js"
+import FormTimer from './FormTimer.vue'
 
 export default {
   name: 'OpenForm',
-  components: {draggable, OpenFormField, OpenFormButton, VueHcaptcha},
+  components: {draggable, OpenFormField, OpenFormButton, VueHcaptcha, FormTimer},
   props: {
     form: {
       type: Object,
@@ -328,6 +333,7 @@ export default {
 
   mounted() {
     this.initForm()
+    this.$refs['form-timer'].startTimer()
     if (import.meta.client && window.location.href.includes('auto_submit=true')) {
       this.isAutoSubmit = true
       this.submitForm()
@@ -349,12 +355,16 @@ export default {
         this.dataForm.submission_id = this.form.submission_id
       }
 
+      this.$refs['form-timer'].stopTimer()
+      this.dataForm.completion_time = this.$refs['form-timer'].completionTime
+
       this.$emit('submit', this.dataForm, this.onSubmissionFailure)
     },
     /**
      * If more than one page, show first page with error
      */
     onSubmissionFailure() {
+      this.$refs['form-timer'].startTimer()
       this.isAutoSubmit = false
       if (this.fieldGroups.length > 1) {
         // Find first mistake and show page