diff --git a/changelog.html b/changelog.html
index 08a5f18fe8d113152d50633d00cf3623a460d6b5..b02b5b67c2df83e2797a5b2d094341b8ce42846b 100644
--- a/changelog.html
+++ b/changelog.html
@@ -65,6 +65,9 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10698">issue 10698</a>)
   <li class=bug>
     404 error when clicking "Build History" link on MyView.
+  <li class=bug>
+    Add a DefaultViewsTabBar config.jelly to avoid jelly exception
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10640">issue 10640</a>)
   <li class=rfe>
     go back to view page when job is deleted.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10510">issue 10510</a>)
diff --git a/core/src/main/resources/hudson/views/DefaultViewsTabBar/DescriptorImpl/config.jelly b/core/src/main/resources/hudson/views/DefaultViewsTabBar/DescriptorImpl/config.jelly
new file mode 100644
index 0000000000000000000000000000000000000000..73d1b6a5a60637b5fbc05b3b80a7e515f15ba579
--- /dev/null
+++ b/core/src/main/resources/hudson/views/DefaultViewsTabBar/DescriptorImpl/config.jelly
@@ -0,0 +1,25 @@
+<!--
+The MIT License
+
+Copyright (c) 2011, Jesse Farinacci
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<j:jelly xmlns:j="jelly:core" />