diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5555b31..75717b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [9.2.2] 2022-12-13
+
+### Fixed
+
+- Fixes issue where changing year on date picker doesn't update calendar tooltip
+
 ## [9.2.1] 2022-12-08
 
 ### Added
diff --git a/package.json b/package.json
index 28c1882..0b338c4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@perimetre/ui",
   "description": "A component library made by @perimetre",
-  "version": "9.2.1",
+  "version": "9.2.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/perimetre/ui.git"
diff --git a/src/components/DatePickerInput/index.tsx b/src/components/DatePickerInput/index.tsx
index 7b31c37..361d6c5 100644
--- a/src/components/DatePickerInput/index.tsx
+++ b/src/components/DatePickerInput/index.tsx
@@ -183,6 +183,8 @@ export const DatePickerInput: React.FC<DatePickerProps> = ({
             ...buttonProps,
             ref: buttonRef
           }}
+          onHide={state.close}
+          onDestroy={() => state?.close && state.close()}
         >
           <FontAwesomeIcon className="h-5 w-5" icon={faCalendar} />
         </Tooltip>
diff --git a/src/components/DateRangePickerInput/index.tsx b/src/components/DateRangePickerInput/index.tsx
index 04bb7d0..e075b23 100644
--- a/src/components/DateRangePickerInput/index.tsx
+++ b/src/components/DateRangePickerInput/index.tsx
@@ -185,6 +185,8 @@ export const DateRangePickerInput: React.FC<DateRangePickerProps> = ({
             ...buttonProps,
             ref: buttonRef
           }}
+          onHide={state.close}
+          onDestroy={() => state?.close && state.close()}
         >
           <FontAwesomeIcon className="h-5 w-5" icon={faCalendar} />
         </Tooltip>