diff --git a/app/package.json b/app/package.json
index 65773d4ef..5b29b635a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.6.0",
+  "version": "5.6.0a",
   "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 94bb581d4..8d34deafb 100644
--- a/app/src/components/new-request/stats.vue
+++ b/app/src/components/new-request/stats.vue
@@ -22,7 +22,7 @@
           nudge-left="45"
           content-class="bottom-tooltip wait-time-tooltip"
           transition="fade-transition"
-          :disabled="isMobile"
+          :disabled="isMobile || !showPriorityTooltip"
         >
           <template #activator="{ on }">
             <div
@@ -46,7 +46,8 @@
           </template>
           <span>
             If you need your name reviewed as quickly as possible, Priority requests
-            are available for a fee ($100.00).
+            are available for a fee ($100.00). Priority name requests are usually
+            reviewed within 1 to 2 business days.
           </span>
         </v-tooltip>
       </v-col>
@@ -60,7 +61,7 @@
           nudge-left="45"
           content-class="bottom-tooltip new-submission-wait-time-tooltip"
           transition="fade-transition"
-          :disabled="isMobile"
+          :disabled="isMobile || !showRegularTooltip"
         >
           <template #activator="{ on }">
             <div
@@ -112,8 +113,8 @@ export default class Stats extends Vue {
 
   async created (): Promise<void> {
     if (
-      GetFeatureFlag('hardcoded_regular_wait_time') === 0 ||
-      GetFeatureFlag('hardcoded_priority_wait_time') === 0
+      GetFeatureFlag('hardcoded_regular_wait_time') < 0 ||
+      GetFeatureFlag('hardcoded_priority_wait_time') < 0
     ) {
       const stats = await NamexServices.fetchStats()
       if (stats) this.setStats(stats)
@@ -126,22 +127,50 @@ export default class Stats extends Vue {
 
   /** The regular wait time, in days. */
   get regularWaitTime (): string | number {
-    const regularWaitTime = GetFeatureFlag('hardcoded_regular_wait_time')
-    if (regularWaitTime > 0) {
-      return regularWaitTime
-    } else {
-      return (this.getStats?.regular_wait_time ?? '-')
+    const flagRaw = GetFeatureFlag('hardcoded_regular_wait_time')
+    const flagVal = Number(flagRaw)
+
+    if (Number.isFinite(flagVal)) {
+      if (flagVal > 0) return flagVal
+      if (flagVal === 0) return '-'
+    }
+
+    const statVal = this.getStats?.regular_wait_time
+    const statNum = Number(statVal)
+    if (Number.isFinite(statNum) && statNum > 0) {
+      return statNum
     }
+
+    return '-'
   }
 
-  /** The priority wait time, in hours. */
+  /** The priority wait time, in days. */
   get priorityWaitTime (): string | number {
-    const priorityWaitTime = GetFeatureFlag('hardcoded_priority_wait_time')
-    if (priorityWaitTime > 0) {
-      return priorityWaitTime
-    } else {
-      return (this.getStats?.priority_wait_time ?? '-')
+    const flagRaw = GetFeatureFlag('hardcoded_priority_wait_time')
+    const flagVal = Number(flagRaw)
+
+    if (Number.isFinite(flagVal)) {
+      if (flagVal > 0) return flagVal
+      if (flagVal === 0) return '-'
+    }
+
+    const statVal = this.getStats?.priority_wait_time
+    const statNum = Number(statVal)
+    if (Number.isFinite(statNum) && statNum > 0) {
+      return statNum
     }
+
+    return '-'
+  }
+
+  get showRegularTooltip (): boolean {
+    const val = Number(this.regularWaitTime)
+    return Number.isFinite(val) && val > 0
+  }
+
+  get showPriorityTooltip (): boolean {
+    const val = Number(this.priorityWaitTime)
+    return Number.isFinite(val) && val > 0
   }
 }
 </script>