diff --git a/dss/localsettings.py b/dss/localsettings.py
index 9b99123..61aae0e 100755
--- a/dss/localsettings.py
+++ b/dss/localsettings.py
@@ -17,7 +17,7 @@ MEDIA_ROOT = os.environ.get('MEDIA_ROOT', '/files/media')
 STATIC_ROOT = os.environ.get('STATIC_ROOT', '/files/static')
 CACHE_ROOT = os.environ.get('CACHE_ROOT', '/files/cache')
 
-MEDIA_URL = os.environ.get('MEDIA_URL', 'http://deepsouthsounds.com/media')  # '{0}media/'.format(CDN_URL)
+MEDIA_URL = os.environ.get('MEDIA_URL', 'http://deepsouthsounds.com/media/')  # '{0}media/'.format(CDN_URL)
 
 REDIS_HOST = 'localhost'
 BROKER_URL = os.environ.get('BROKER_URL', 'amqp://guest:guest@localhost:5672//')
diff --git a/spa/models/mix.py b/spa/models/mix.py
index 679f747..bde24ac 100755
--- a/spa/models/mix.py
+++ b/spa/models/mix.py
@@ -159,8 +159,7 @@ class Mix(BaseModel):
 
         if self.waveform_generated:
             waveform_root = settings.WAVEFORM_URL \
-                if hasattr(localsettings,
-                           'WAVEFORM_URL') else "%swaveforms" % settings.MEDIA_URL
+                if hasattr(settings, 'WAVEFORM_URL') else "%swaveforms" % settings.MEDIA_URL
 
             ret = "%s/%s%s.%s" % (waveform_root, self.uid, waveform_type, "png")
             return url.urlclean(ret)