diff --git a/CHANGELOG.md b/CHANGELOG.md
index 619903c4523..9541c1bee8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 1. [16204](https://github.com/influxdata/influxdb/pull/16204): Fix failure to create labels when creating telegraf configs
 1. [16207](https://github.com/influxdata/influxdb/pull/16207): Fix crash when editing a Telegraf config
 1. [16201](https://github.com/influxdata/influxdb/pull/16201): Updated start/endtime functionality so that custom script timeranges overwrite dropdown selections
+1. [16217](https://github.com/influxdata/influxdb/pull/16217): Fix 12-hour time format to use consistent formatting and number of time ticks
 
 ### UI Improvements
 
diff --git a/ui/package.json b/ui/package.json
index 36b69015031..78c26444c83 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -129,7 +129,7 @@
   "dependencies": {
     "@influxdata/clockface": "1.1.0",
     "@influxdata/flux-parser": "^0.3.0",
-    "@influxdata/giraffe": "0.16.10",
+    "@influxdata/giraffe": "0.16.11",
     "@influxdata/influx": "0.5.5",
     "@influxdata/influxdb-templates": "0.9.0",
     "@influxdata/react-custom-scrollbars": "4.3.8",
diff --git a/ui/src/dashboards/constants/index.ts b/ui/src/dashboards/constants/index.ts
index bc1cd40e6b2..4ceacc01f68 100644
--- a/ui/src/dashboards/constants/index.ts
+++ b/ui/src/dashboards/constants/index.ts
@@ -36,7 +36,7 @@ export const FORMAT_OPTIONS: Array<{text: string}> = [
   {text: 'DD/MM/YYYY HH:mm:ss.sss'},
   {text: 'MM/DD/YYYY HH:mm:ss.sss'},
   {text: 'YYYY/MM/DD HH:mm:ss'},
-  {text: 'HH:mm a'},
+  {text: 'hh:mm a'},
   {text: 'HH:mm'},
   {text: 'HH:mm:ss'},
   {text: 'HH:mm:ss ZZ'},
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 0498ca28655..a42f2dca844 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1014,10 +1014,10 @@
   resolved "https://registry.yarnpkg.com/@influxdata/flux-parser/-/flux-parser-0.3.0.tgz#b63123ac814ad32c65e46a4097ba3d8b959416a5"
   integrity sha512-nsm801l60kXFulcSWA2YH2YRz9oSsMlTK9Evn6Og9BoQnQMcwUsSUEug8mQRIUljnkNYV58JSs0W0mP8h7Y/ZQ==
 
-"@influxdata/giraffe@0.16.10":
-  version "0.16.10"
-  resolved "https://registry.yarnpkg.com/@influxdata/giraffe/-/giraffe-0.16.10.tgz#17115d1fce65e5a1601b319d964ec839df3b84c7"
-  integrity sha512-H/FZmiBse1Z/zz4OS1nPA75RiLvjhx9bUCiawqeXWI9DNyeqykme8kKAmJCUOd3KuGRunzNZ1Zdq77pM7z4Yjg==
+"@influxdata/giraffe@0.16.11":
+  version "0.16.11"
+  resolved "https://registry.yarnpkg.com/@influxdata/giraffe/-/giraffe-0.16.11.tgz#593524758ac74fac170226edc4be79f173b2ea50"
+  integrity sha512-66ayOS3OSXBrbm9ERiLiQbTDPkHjQiwmxsl3w4obzmH92U4vRU95nrGg/wgWVBnnTLAOvCkNOJ5MlyZlRUO4zA==
 
 "@influxdata/influx@0.5.5":
   version "0.5.5"