diff --git a/CHANGELOG.md b/CHANGELOG.md
index eab7cbfb86..fbfa4b275d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## TBD
+
+### Enhancements
+
+* Add original error class and message to metadata for link errors loading BugSnag libraries
+  [#2070](https://github.com/bugsnag/bugsnag-android/pull/2070)
+
 ## 6.7.0 (2024-08-08)
 
 ### Enhancements
diff --git a/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt b/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt
index 5745b3e2fe..912b0e3016 100644
--- a/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt
+++ b/bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrPlugin.kt
@@ -69,6 +69,9 @@ internal class AnrPlugin : Plugin {
     private fun performOneTimeSetup(client: Client) {
         val isLoaded = libraryLoader.loadLibrary("bugsnag-plugin-android-anr", client) {
             val error = it.errors[0]
+            it.addMetadata("LinkError", "errorClass", error.errorClass)
+            it.addMetadata("LinkError", "errorMessage", error.errorMessage)
+
             error.errorClass = "AnrLinkError"
             error.errorMessage = LOAD_ERR_MSG
             true