diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index 8a313d5c2d8..2aedf61444d 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -484,12 +484,10 @@ WiredTigerKVEngine::WiredTigerKVEngine(const std::string& canonicalName,
 
     {
         char buf[(2 * 8 /*bytes in hex*/) + 1 /*nul terminator*/];
-        int ret = _conn->query_timestamp(_conn, buf, "get=oldest");
-        if (ret != WT_NOTFOUND) {
-            invariantWTOK(ret, nullptr);
-
-            std::uint64_t tmp;
-            fassert(5380107, NumberParser().base(16)(buf, &tmp));
+        invariantWTOK(_conn->query_timestamp(_conn, buf, "get=oldest"), nullptr);
+        std::uint64_t tmp;
+        fassert(5380107, NumberParser().base(16)(buf, &tmp));
+        if (tmp != 0) {
             LOGV2_FOR_RECOVERY(
                 5380106, 0, "WiredTiger oldestTimestamp", "oldestTimestamp"_attr = Timestamp(tmp));
             // The oldest timestamp is set in WT. Only set the in-memory variable.
@@ -2092,17 +2090,14 @@ uint64_t _fetchAllDurableValue(WT_CONNECTION* conn) {
     // Fetch the latest all_durable value from the storage engine. This value will be a timestamp
     // that has no holes (uncommitted transactions with lower timestamps) behind it.
     char buf[(2 * 8 /*bytes in hex*/) + 1 /*nul terminator*/];
-    auto wtStatus = conn->query_timestamp(conn, buf, "get=all_durable");
-    if (wtStatus == WT_NOTFOUND) {
+    invariantWTOK(conn->query_timestamp(conn, buf, "get=all_durable"), nullptr);
+    uint64_t tmp;
+    fassert(38002, NumberParser().base(16)(buf, &tmp));
+    if (tmp == 0) {
         // Treat this as lowest possible timestamp; we need to see all preexisting data but no new
         // (timestamped) data.
         return StorageEngine::kMinimumTimestamp;
-    } else {
-        invariantWTOK(wtStatus, nullptr);
     }
-
-    uint64_t tmp;
-    fassert(38002, NumberParser().base(16)(buf, &tmp));
     return tmp;
 }
 }  // namespace