diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index f403c4b4f986be0f02ef95764ce4b7d049bdb40d..93e0f9b2126a9abcd952660d118cc4a5f36238ae 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -29,7 +29,7 @@ ALLOWED_HOSTS = ["localhost", ".herokuapp.com", ".northbaypython.org"]
 # timezone as the operating system.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = "UTC"
+TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles")
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html