diff --git a/src/rocks_record_store.cpp b/src/rocks_record_store.cpp
index 44ce3fd1..737a4848 100644
--- a/src/rocks_record_store.cpp
+++ b/src/rocks_record_store.cpp
@@ -1066,13 +1066,12 @@ namespace mongo {
         _currentSequenceNumber =
           RocksRecoveryUnit::getRocksRecoveryUnit(opCtx)->snapshot()->GetSequenceNumber();
 
-        if (!startIterator.isNull() && !_readUntilForOplog.isNull()) {
+        if (!startIterator.isNull()) {
             // This is a hack to speed up first/last record retrieval from the oplog
+            _oplogHackRestoreBeforeNext = true;
             _needFirstSeek = false;
             _lastLoc = startIterator;
-            iterator();
-            _skipNextAdvance = true;
-            _eof = false;
+            restore();
         }
     }
 
@@ -1130,6 +1129,7 @@ namespace mongo {
     }
 
     boost::optional<Record> RocksRecordStore::Cursor::next() {
+        _oplogHackRestoreBeforeNext = false;
         if (_eof) {
             return {};
         }
@@ -1191,12 +1191,18 @@ namespace mongo {
             _currentSequenceNumber = ru->snapshot()->GetSequenceNumber();
         }
 
-        _skipNextAdvance = false;
-
-        if (_eof) return true;
-        if (_needFirstSeek) return true;
+        if (_eof || _needFirstSeek) {
+            _skipNextAdvance = false;
+            return true;
+        }
 
+        // _skipNextAdvance is reset by positionIterator()
+        // but in oplog first record retrieval hack case another logic is in use
         positionIterator();
+        if (_oplogHackRestoreBeforeNext) {
+            _skipNextAdvance = true;
+            _eof = false;
+        }
         // Return false if the collection is capped and we reached an EOF. Otherwise return true.
         return _cappedVisibilityManager && _eof ? false : true;
     }
diff --git a/src/rocks_record_store.h b/src/rocks_record_store.h
index 42f908f0..b1cba0f1 100644
--- a/src/rocks_record_store.h
+++ b/src/rocks_record_store.h
@@ -254,6 +254,8 @@ namespace mongo {
             RecordId _lastLoc;
             std::unique_ptr<rocksdb::Iterator> _iterator;
             std::string _seekExactResult;
+            // true between oplog first record retrieval hack start and first next() call
+            bool _oplogHackRestoreBeforeNext = false;
             void positionIterator();
             rocksdb::Iterator* iterator();
         };