diff --git a/app/package.json b/app/package.json
index 6bea50211..a8ee0c168 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",
diff --git a/app/src/components/new-request/stats.vue b/app/src/components/new-request/stats.vue
index c55a593d8..c02e62148 100644
--- a/app/src/components/new-request/stats.vue
+++ b/app/src/components/new-request/stats.vue
@@ -123,20 +123,26 @@ export default class Stats extends Vue {
     return (this.getStats?.auto_approved_count ?? '-')
   }
 
-  /** The regular wait time, in days. */
+  /**
+   * The regular wait time, in days.
+   * @returns value from FF if FF is >= 0, otherwise the value from the API
+   */
   get regularWaitTime (): string | number {
-    const regularWaitTime = GetFeatureFlag('hardcoded_regular_wait_time')
-    if (regularWaitTime > 0) {
+    const regularWaitTime = GetFeatureFlag('hardcoded_regular_wait_time') as number
+    if (regularWaitTime >= 0) {
       return regularWaitTime
     } else {
       return (this.getStats?.regular_wait_time ?? '-')
     }
   }
 
-  /** The priority wait time, in hours. */
+  /**
+   * The priority wait time, in hours.
+   * @returns value from FF if FF is >= 0, otherwise the value from the API
+   */
   get priorityWaitTime (): string | number {
-    const priorityWaitTime = GetFeatureFlag('hardcoded_priority_wait_time')
-    if (priorityWaitTime > 0) {
+    const priorityWaitTime = GetFeatureFlag('hardcoded_priority_wait_time') as number
+    if (priorityWaitTime >= 0) {
       return priorityWaitTime
     } else {
       return (this.getStats?.priority_wait_time ?? '-')
diff --git a/app/src/plugins/launchDarkly.ts b/app/src/plugins/launchDarkly.ts
index 5ae759ae8..e835994ec 100644
--- a/app/src/plugins/launchDarkly.ts
+++ b/app/src/plugins/launchDarkly.ts
@@ -14,8 +14,8 @@ const defaultFlagSet: LDFlagSet = {
   'enable-priority-checkbox': false, // by default, priority is disabled
   'enable-society': false, // by default society is disabled
   'enable-web-chat': false, // by default, old webchat is disabled
-  'hardcoded_priority_wait_time': 0, // by default, use actual wait time
-  'hardcoded_regular_wait_time': 0, // by default, use actual wait time
+  'hardcoded_priority_wait_time': -1, // by default, use actual wait time
+  'hardcoded_regular_wait_time': -1, // by default, use actual wait time
   'supported-amalgamation-entities': [],
   'supported-continuation-in-entities': [],
   'supported-incorporation-registration-entities': [],