diff --git a/CHANGES.rst b/CHANGES.rst
index f7508afd..5e06fc4f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,7 @@ Version 1.1.0
 
 Unreleased
 
+-   Fix :issue:`34` - create_jinja_environment
 -   Bump minimum Werkzeug version to >= 0.15.
 -   Drop support for Python 3.4.
 -   :meth:`flask.RequestContext.copy` includes the current session
diff --git a/flask/app.py b/flask/app.py
index ab4254ef..6722515a 100644
--- a/flask/app.py
+++ b/flask/app.py
@@ -674,7 +674,7 @@ def jinja_env(self):
         accessed. Changing :attr:`jinja_options` after that will have no
         effect.
         """
-        return None
+        return self.create_jinja_environment()
 
     @property
     def got_first_request(self):