diff --git a/bom/pom.xml b/bom/pom.xml
index 10a56cc768..ac14041c0a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -41,7 +41,7 @@ THE SOFTWARE.
     <commons-fileupload2.version>2.0.0-M5</commons-fileupload2.version>
     <groovy.version>2.4.21</groovy.version>
     <jelly.version>1.1-jenkins-20260418</jelly.version>
-    <stapler.version>2107.v8dfcb_e8ed317</stapler.version>
+    <stapler.version>2117.vb_66952503166</stapler.version>
   </properties>
 
   <dependencyManagement>
diff --git a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
index bb08bbc3c6..71255513c2 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbIssuer.java
@@ -248,19 +248,30 @@ public abstract class CrumbIssuer implements Describable<CrumbIssuer>, Extension
             @Override
             public String issueCrumb(StaplerRequest2 request) {
                 CrumbIssuer ci = Jenkins.get().getCrumbIssuer();
-                return ci != null ? ci.getCrumb(request) : DEFAULT.issueCrumb(request);
+                return ci != null ? ci.getCrumb(request) : NONE.issueCrumb(request);
             }
 
             @Override
             public void validateCrumb(StaplerRequest2 request, String submittedCrumb) {
                 CrumbIssuer ci = Jenkins.get().getCrumbIssuer();
                 if (ci == null) {
-                    DEFAULT.validateCrumb(request, submittedCrumb);
+                    NONE.validateCrumb(request, submittedCrumb);
                 } else {
                     if (!ci.validateCrumb(request, ci.getDescriptor().getCrumbSalt(), submittedCrumb))
                         throw new SecurityException("Crumb didn't match");
                 }
             }
+
+            @Override
+            public String getCrumbExpression() {
+                CrumbIssuer ci = Jenkins.get().getCrumbIssuer();
+                if (ci == null) {
+                    return NONE.getCrumbExpression();
+                } else {
+                    return "document.head.dataset.crumbValue";
+                }
+
+            }
         });
     }