diff --git a/src/sqlite3.c b/src/sqlite3.c
index 71cad452d44df9005a7d6795cdf858c6e04239ec..c9fc0bf940e84d18bf7898da12551a9efb459b43 100644
--- a/src/sqlite3.c
+++ b/src/sqlite3.c
@@ -161689,6 +161689,10 @@ static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
       if( pFrom->isOrdered==pWInfo->pOrderBy->nExpr ){
         pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
       }
+      if( pWInfo->pSelect->pOrderBy
+       && pWInfo->nOBSat > pWInfo->pSelect->pOrderBy->nExpr ){
+        pWInfo->nOBSat = pWInfo->pSelect->pOrderBy->nExpr;
+      }
     }else{
       pWInfo->revMask = pFrom->revLoop;
       if( pWInfo->nOBSat<=0 ){