diff --git a/package-lock.json b/package-lock.json
index 28d6eedc4..4c270a9db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "@tailwindcss/forms": "^0.5.0",
         "@tailwindcss/typography": "^0.5.2",
         "@types/lodash.debounce": "4.0.9",
-        "date-fns": "2.30.0",
+        "date-fns": "3.6.0",
         "dompurify": "3.1.0",
         "highlight.js": "11.9.0",
         "lodash.debounce": "4.0.8",
@@ -87,17 +87,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz",
-      "integrity": "sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==",
-      "dependencies": {
-        "regenerator-runtime": "^0.13.11"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -2119,18 +2108,12 @@
       }
     },
     "node_modules/date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=0.11"
-      },
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
+      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
       }
     },
     "node_modules/de-indent": {
@@ -4607,11 +4590,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@@ -5812,14 +5790,6 @@
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
       "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg=="
     },
-    "@babel/runtime": {
-      "version": "7.21.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz",
-      "integrity": "sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==",
-      "requires": {
-        "regenerator-runtime": "^0.13.11"
-      }
-    },
     "@cspotcode/source-map-support": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -7138,12 +7108,9 @@
       }
     },
     "date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "requires": {
-        "@babel/runtime": "^7.21.0"
-      }
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
+      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww=="
     },
     "de-indent": {
       "version": "1.0.2",
@@ -8919,11 +8886,6 @@
         "picomatch": "^2.2.1"
       }
     },
-    "regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
-    },
     "regexp.prototype.flags": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
diff --git a/package.json b/package.json
index de6a0db20..18d17efe8 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "@tailwindcss/forms": "^0.5.0",
     "@tailwindcss/typography": "^0.5.2",
     "@types/lodash.debounce": "4.0.9",
-    "date-fns": "2.30.0",
+    "date-fns": "3.6.0",
     "dompurify": "3.1.0",
     "highlight.js": "11.9.0",
     "lodash.debounce": "4.0.8",
diff --git a/src/components/DateRangeSelect/PDateRangeSelect.vue b/src/components/DateRangeSelect/PDateRangeSelect.vue
index 122f1fbc7..3200a5d77 100644
--- a/src/components/DateRangeSelect/PDateRangeSelect.vue
+++ b/src/components/DateRangeSelect/PDateRangeSelect.vue
@@ -42,7 +42,8 @@
 
 <script lang="ts" setup>
   import { useElementRect, useKeyDown } from '@prefecthq/vue-compositions'
-  import { addDays, addSeconds, isAfter, isBefore, secondsInDay } from 'date-fns'
+  import { addDays, addSeconds, isAfter, isBefore } from 'date-fns'
+  import { secondsInDay } from 'date-fns/constants'
   import { computed, ref, watch } from 'vue'
   import PButton from '@/components/Button/PButton.vue'
   import PDateRangeSelectAround from '@/components/DateRangeSelect/PDateRangeSelectAround.vue'
diff --git a/src/components/DateRangeSelect/PDateRangeSelectOptions.vue b/src/components/DateRangeSelect/PDateRangeSelectOptions.vue
index 314eaa37a..3f76c4dac 100644
--- a/src/components/DateRangeSelect/PDateRangeSelectOptions.vue
+++ b/src/components/DateRangeSelect/PDateRangeSelectOptions.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { secondsInDay, secondsInHour, secondsInWeek } from 'date-fns'
+  import { secondsInDay, secondsInHour, secondsInWeek } from 'date-fns/constants'
   import { computed } from 'vue'
   import { DateRangeSelectMode } from '@/components/DateRangeSelect/PDateRangeSelect.vue'
   import PSelectOptions from '@/components/Select/PSelectOptions.vue'
diff --git a/src/components/DateRangeSelect/PDateRangeSelectRelative.vue b/src/components/DateRangeSelect/PDateRangeSelectRelative.vue
index c80132e89..166957886 100644
--- a/src/components/DateRangeSelect/PDateRangeSelectRelative.vue
+++ b/src/components/DateRangeSelect/PDateRangeSelectRelative.vue
@@ -15,7 +15,8 @@
 </template>
 
 <script lang="ts" setup>
-  import { secondsInMinute, secondsInHour, secondsInDay, secondsInWeek, secondsInMonth, addSeconds, isBefore, isAfter } from 'date-fns'
+  import { addSeconds, isBefore, isAfter } from 'date-fns'
+  import { secondsInMinute, secondsInHour, secondsInDay, secondsInWeek, secondsInMonth } from 'date-fns/constants'
   import { computed, onMounted, ref } from 'vue'
   import PSelectOptions from '@/components/Select/PSelectOptions.vue'
   import PTextInput from '@/components/TextInput/PTextInput.vue'
diff --git a/src/utilities/dateRangeSelect.ts b/src/utilities/dateRangeSelect.ts
index 4c3971664..747ad940a 100644
--- a/src/utilities/dateRangeSelect.ts
+++ b/src/utilities/dateRangeSelect.ts
@@ -1,4 +1,5 @@
-import { addSeconds, differenceInSeconds, endOfToday, endOfWeek, secondsInDay, secondsInHour, secondsInMinute, startOfToday, startOfWeek, subSeconds } from 'date-fns'
+import { addSeconds, differenceInSeconds, endOfToday, startOfToday, subSeconds } from 'date-fns'
+import { secondsInDay, secondsInHour, secondsInMinute } from 'date-fns/constants'
 import { DateRangeSelectAroundUnit, DateRangeSelectAroundValue, DateRangeSelectPeriodValue, DateRangeSelectRangeValue, DateRangeSelectSpanValue, DateRangeSelectValue } from '@/types/dateRange'
 
 function nowWithoutMilliseconds(): Date {