diff --git a/tensorflow/core/common_runtime/eager/tensor_handle.cc b/tensorflow/core/common_runtime/eager/tensor_handle.cc
index 12bd70d705d..d7b2ef4be1e 100644
--- a/tensorflow/core/common_runtime/eager/tensor_handle.cc
+++ b/tensorflow/core/common_runtime/eager/tensor_handle.cc
@@ -316,8 +316,7 @@ Status TensorHandle::CreatePackedHandle(std::vector<TensorHandle*>&& handles,
   std::vector<string> devices;
   for (auto* handle : handles) {
     if (VariantDeviceIsCustom(handle->device())) {
-      return errors::InvalidArgument(
-          "CustomDevice is not supported for packing.");
+      devices.push_back(absl::get<CustomDevice*>(handle->device())->name());
     } else {
       devices.push_back(handle->op_device() ? handle->op_device()->name()
                                             : ctx->HostCPU()->name());