diff --git a/urls.py b/urls.py
index b8dd4cb..46e378c 100644
--- a/urls.py
+++ b/urls.py
@@ -68,6 +68,11 @@ urlpatterns = patterns('',
     url(r'^', include('snipts.urls')),
 )
 
-urlpatterns += patterns('',
-    (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'media')}),
-)
+if DEBUG:
+  urlpatterns += patterns('',
+      (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'media')}),
+  )
+else:
+  urlpatterns += patterns('',
+      (r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'static')}),
+  )