diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3960abc6e..781c712d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 **Features**:
 - [NDK] Expose option to set handler strategy ([#1099](https://github.com/getsentry/sentry-native/pull/1099))
+- Add Linux distributions to the OS context. [#963](https://github.com/getsentry/sentry-native/pull/963)
+
+**Fixes**:
+- Add metadata pointer check to prevent crash on cleaning crashpad database. ([#1102](https://github.com/getsentry/sentry-native/pull/1102), [crashpad#1064](https://github.com/getsentry/sentry-native/issues/1064))
 
 ## 0.7.16
 
@@ -120,7 +124,6 @@
 
 **Features**:
 
-- Add Linux distributions to the OS context. [#963](https://github.com/getsentry/sentry-native/pull/963)
 - Change the timestamp resolution to microseconds. ([#995](https://github.com/getsentry/sentry-native/pull/995))
 
 **Internal**:
diff --git a/external/crashpad b/external/crashpad
index 852f8fea9..8730fa1d3 160000
--- a/external/crashpad
+++ b/external/crashpad
@@ -1 +1 @@
-Subproject commit 852f8fea9cbea7a63610b8c698f301bd1ba4b3cd
+Subproject commit 8730fa1d336b43e0c5bd3e08f4af5b8f47cfc266