diff --git a/src/dawn/native/Device.cpp b/src/dawn/native/Device.cpp
index af8f738..ec3b63a 100644
--- a/src/dawn/native/Device.cpp
+++ b/src/dawn/native/Device.cpp
@@ -415,11 +415,13 @@
         dawn::WarningLog() << "Uncaptured error after last external device reference dropped.\n"
                            << message;
     };
+    mUncapturedErrorUserdata = nullptr;
 
     mDeviceLostCallback = [](WGPUDeviceLostReason, char const* message, void*) {
         dawn::WarningLog() << "Device lost after last external device reference dropped.\n"
                            << message;
     };
+    mDeviceLostUserdata = nullptr;
 
     // mAdapter is not set for mock test devices.
     // TODO(crbug.com/dawn/1702): using a mock adapter could avoid the null checking.
@@ -689,6 +691,13 @@
     // this call.
     FlushCallbackTaskQueue();
     auto deviceLock(GetScopedLock());
+    // Clearing the callback and userdata is allowed because in Chromium they should be cleared
+    // after Dawn device is destroyed and before Dawn wire server is destroyed.
+    if (callback == nullptr) {
+        mUncapturedErrorCallback = nullptr;
+        mUncapturedErrorUserdata = nullptr;
+        return;
+    }
     if (IsLost()) {
         return;
     }
@@ -706,6 +715,13 @@
     // this call.
     FlushCallbackTaskQueue();
     auto deviceLock(GetScopedLock());
+    // Clearing the callback and userdata is allowed because in Chromium they should be cleared
+    // after Dawn device is destroyed and before Dawn wire server is destroyed.
+    if (callback == nullptr) {
+        mDeviceLostCallback = nullptr;
+        mDeviceLostUserdata = nullptr;
+        return;
+    }
     if (IsLost()) {
         return;
     }
diff --git a/src/dawn/native/Device.h b/src/dawn/native/Device.h
index 69128c6..663ce83 100644
--- a/src/dawn/native/Device.h
+++ b/src/dawn/native/Device.h
@@ -580,17 +580,14 @@
                                                     const Extent3D& copySizePixels) = 0;
 
     wgpu::ErrorCallback mUncapturedErrorCallback = nullptr;
-    // TODO(https://crbug.com/dawn/2349): Investigate DanglingUntriaged in dawn/native.
-    raw_ptr<void, DanglingUntriaged> mUncapturedErrorUserdata = nullptr;
+    raw_ptr<void> mUncapturedErrorUserdata = nullptr;
 
     std::shared_mutex mLoggingMutex;
     wgpu::LoggingCallback mLoggingCallback = nullptr;
-    // TODO(https://crbug.com/dawn/2349): Investigate DanglingUntriaged in dawn/native.
-    raw_ptr<void, DanglingUntriaged> mLoggingUserdata = nullptr;
+    raw_ptr<void> mLoggingUserdata = nullptr;
 
     wgpu::DeviceLostCallback mDeviceLostCallback = nullptr;
-    // TODO(https://crbug.com/dawn/2349): Investigate DanglingUntriaged in dawn/native.
-    raw_ptr<void, DanglingUntriaged> mDeviceLostUserdata = nullptr;
+    raw_ptr<void> mDeviceLostUserdata = nullptr;
 
     std::unique_ptr<ErrorScopeStack> mErrorScopeStack;