diff --git a/moscowdjango/settings_staging.py b/moscowdjango/settings_staging.py
index a119e8b..4249b99 100644
--- a/moscowdjango/settings_staging.py
+++ b/moscowdjango/settings_staging.py
@@ -1,7 +1,7 @@
 # Django settings for moscowdjango project.
 from .settings import *
 
-DEBUG = True
+DEBUG = os.environ.get('DEBUG', False)
 
 EMBEDLY_KEY = os.environ.get('EMBEDLY_KEY')
 SECRET_KEY = os.environ.get('SECRET_KEY')
@@ -16,10 +16,10 @@
 
 # Media & static
 DEFAULT_FILE_STORAGE = 'moscowdjango.amazon.DefaultStorage'
+STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'
 DEFAULT_S3_PATH = "media"
 MEDIA_ROOT = '/%s/' % DEFAULT_S3_PATH
 MEDIA_URL = 'https://%s.s3.amazonaws.com/media/' % AWS_STORAGE_BUCKET_NAME
-STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'
 
 # Django compressor
 COMPRESS_ENABLED = False