diff --git a/tensorflow/compiler/xla/python/local_client.h b/tensorflow/compiler/xla/python/local_client.h
index efed57c1f28..514af171977 100644
--- a/tensorflow/compiler/xla/python/local_client.h
+++ b/tensorflow/compiler/xla/python/local_client.h
@@ -214,13 +214,18 @@ class PyLocalClient {
  protected:
   std::string platform_name_;
   LocalClient* client_;
+
+  // py_ref_manager_ must come after devices_ in the class destruction order
+  // (i.e., appear first in the class.)
+  // Destruction of devices waits for them to quiesce; callbacks on device
+  // streams may refer to py_ref_manager_ and we must wait for them to complete.
+  PythonRefManager py_ref_manager_;
+
   std::vector<std::unique_ptr<Device>> devices_;
   se::DeviceMemoryAllocator* allocator_;
   std::unique_ptr<se::DeviceMemoryAllocator> owned_allocator_;
 
   tensorflow::thread::ThreadPool h2d_transfer_pool_;
-
-  PythonRefManager py_ref_manager_;
 };
 
 // Holds a reference from Python to one or more device buffers.