diff --git a/src/formio/components/TimeField.js b/src/formio/components/TimeField.js
index f1ab35e06..bcf37a46c 100644
--- a/src/formio/components/TimeField.js
+++ b/src/formio/components/TimeField.js
@@ -29,6 +29,20 @@ class TimeField extends Time {
     ].join(' ');
     return info;
   }
+
+  getStringAsValue(value) {
+    const result = super.getStringAsValue(value);
+    if (result === 'Invalid date') return value;
+
+    return result;
+  }
+
+  getValueAsString(value) {
+    const result = super.getValueAsString(value);
+    if (result === 'Invalid date') return value;
+
+    return result;
+  }
 }
 
 export default TimeField;