diff --git a/docs/en_US/release_notes_6_8.rst b/docs/en_US/release_notes_6_8.rst
index 61f5825a0..89db80062 100644
--- a/docs/en_US/release_notes_6_8.rst
+++ b/docs/en_US/release_notes_6_8.rst
@@ -26,3 +26,4 @@ Bug fixes
   | `Issue #7257 <https://redmine.postgresql.org/issues/7257>`_ -  Support running the container under OpenShift with alternate UIDs.
   | `Issue #7261 <https://redmine.postgresql.org/issues/7261>`_ -  Correct typo in the documentation.
   | `Issue #7267 <https://redmine.postgresql.org/issues/7267>`_ -  Fixed an issue where unexpected error messages are displayed when users change the language via preferences.
+  | `Issue #7269 <https://redmine.postgresql.org/issues/7269>`_ -  Ensure that pgAdmin4 should work with latest jinja2 version.
diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py
index 19befe9f5..d5188dd5d 100644
--- a/web/pgadmin/__init__.py
+++ b/web/pgadmin/__init__.py
@@ -33,6 +33,7 @@ from flask_security.utils import login_user, logout_user
 from werkzeug.datastructures import ImmutableDict
 from werkzeug.local import LocalProxy
 from werkzeug.utils import find_modules
+from jinja2 import select_autoescape
 
 from pgadmin.model import db, Role, Server, SharedServer, ServerGroup, \
     User, Keys, Version, SCHEMA_VERSION as CURRENT_SCHEMA_VERSION
@@ -70,7 +71,7 @@ class PgAdmin(Flask):
     def __init__(self, *args, **kwargs):
         # Set the template loader to a postgres-version-aware loader
         self.jinja_options = ImmutableDict(
-            extensions=['jinja2.ext.autoescape', 'jinja2.ext.with_'],
+            autoescape=select_autoescape(enabled_extensions=('html', 'xml')),
             loader=VersionedTemplateLoader(self)
         )
         self.logout_hooks = []