diff --git a/manifest b/manifest
index 34f2def2b0..d61e78c6fa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sfor\n[forum:/forumpost/c2554d560bac97c5|forum\spost\sc2554d560bac97c5].
-D 2022-05-31T10:48:02.038
+C Add\sback\sin\sa\stest\scase\sfor\sON-clauses\sthat\swas\sremoved\syesterday\sby\n[3869fd9a2b9483cbf]\sbut\swhich\sturned\sout\sto\sbe\snecessary\safter\sall.
+D 2022-05-31T11:13:55.131
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -656,7 +656,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c c4b64c6fa224e5b89ed547ec0ebdfd243c081509b195e71581164a2fbb8d4a80
 F src/whereInt.h 8da918f392bf202ccc0ee61291455b33ad171d209445f1ff3eaf62e0b6f6b363
-F src/wherecode.c 056c96e617cbd3cebcbf68b80f85f2a8ad3e7aa6dbbe53cdd7bf25982f06a950
+F src/wherecode.c 1d5bed686d60e272e93c04e34fec5b487d086383dd4773a7f2f98f86278e6a94
 F src/whereexpr.c 7c5ee52e1df81d6a43f39e6b6f35d540fd37254e2b6e953a4e2715c3abf26f46
 F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1970,11 +1970,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3869fd9a2b9483cbbf83d8f369c1744abc42f12e63abba402be35dd7e136161c
-R d4fdf081437fc8162541247b3df842f3
-T *branch * right-join-bug-20220531
-T *sym-right-join-bug-20220531 *
-T -sym-trunk *
+P e66d5ae86c09cbe581b8f4f1bff33376cc680bba3da24f85384dd6c3eb85ddcf
+R 3e60453d28944ca6bb7a2ff19b9db715
 U drh
-Z 3da6eb487d8628e64e88a5b27a299156
+Z eef6ea5d1067ce4e170dd6b266a8114a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1944c83c32..da37356182 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e66d5ae86c09cbe581b8f4f1bff33376cc680bba3da24f85384dd6c3eb85ddcf
\ No newline at end of file
+aba52a90eef2a5d06e7c499fe84b2efcde7f01e67129058f8223a6a0272aacb9
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 6617b60396..66099fb0b7 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2627,6 +2627,12 @@ Bitmask sqlite3WhereCodeOneLoopStart(
         }else if( (pTabItem->fg.jointype & JT_LEFT)==JT_LEFT
                && !ExprHasProperty(pE,EP_OuterON) ){
           continue;
+        }else{
+          Bitmask m = sqlite3WhereGetMask(&pWInfo->sMaskSet, pE->w.iJoin);
+          if( m & pLevel->notReady ){
+            /* An ON clause that is not ripe */
+            continue;
+          }
         }
       }
       if( iLoop==1 && !sqlite3ExprCoveredByIndex(pE, pLevel->iTabCur, pIdx) ){