diff --git a/src/yb/client/transaction.cc b/src/yb/client/transaction.cc
index 90f070d07b5..f3de9525722 100644
--- a/src/yb/client/transaction.cc
+++ b/src/yb/client/transaction.cc
@@ -394,6 +394,7 @@ class YBTransaction::Impl final : public internal::TxnBatcherIf {
       } else {
         other->metadata_.start_time = other->read_point_.Now();
       }
+      other->metadata_.pg_txn_start_us = metadata_.pg_txn_start_us;
       state_.store(TransactionState::kAborted, std::memory_order_release);
     }
     DoAbort(TransactionRpcDeadline(), transaction);
diff --git a/src/yb/docdb/wait_queue.cc b/src/yb/docdb/wait_queue.cc
index 63523d4bab8..73e0c185e40 100644
--- a/src/yb/docdb/wait_queue.cc
+++ b/src/yb/docdb/wait_queue.cc
@@ -277,7 +277,7 @@ struct WaiterData : public std::enable_shared_from_this<WaiterData> {
         finished_waiting_latency_(*finished_waiting_latency),
         unlocked_(locks->Unlock()),
         deadline_(deadline) {
-    DCHECK(txn_start_us || id.IsNil());
+    LOG_IF_WITH_PREFIX(DFATAL, !txn_start_us && !id.IsNil()) << "Expected non-zero txn_start_us";
     VLOG_WITH_PREFIX(4) << "Constructed waiter";
   }