diff --git a/www/conservancy/settings.py b/www/conservancy/settings.py
index 1edd532c4a2b08ba4ad496741377446fac1984a0..302aac66439aeb272394030e1953bf91f8efe883 100644
--- a/www/conservancy/settings.py
+++ b/www/conservancy/settings.py
@@ -24,8 +24,7 @@ from djangocommonsettings import *
 SITE_ID = 2
 ROOT_URLCONF = 'conservancy.urls'
 
-
-FORCE_CANONICAL_HOSTNAME = "sfconservancy.org"
+FORCE_CANONICAL_HOSTNAME = False if DEBUG else 'sfconservancy.org'
 
 ALLOWED_HOSTS = [ 'www.sfconservancy.org', 'aspen.sfconservancy.org', 'sfconservancy.org',  u'104.130.70.210' ]