diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 6118eb3018..357ff7cd0d 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -4,6 +4,10 @@ Specific overrides to the base prod settings to make development easier.
 
 from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
 
+# Don't use S3 in devstack, fall back to filesystem
+del DEFAULT_FILE_STORAGE
+MEDIA_ROOT = "/edx/app/edxapp/media"
+
 DEBUG = True
 USE_I18N = True
 TEMPLATE_DEBUG = DEBUG
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index 3722efd6ae..9fe16128ca 100644
--- a/lms/envs/devstack.py
+++ b/lms/envs/devstack.py
@@ -4,6 +4,11 @@ Specific overrides to the base prod settings to make development easier.
 
 from .aws import * # pylint: disable=wildcard-import, unused-wildcard-import
 
+# Don't use S3 in devstack, fall back to filesystem
+del DEFAULT_FILE_STORAGE
+MEDIA_ROOT = "/edx/app/edxapp/media"
+
+
 DEBUG = True
 USE_I18N = True
 TEMPLATE_DEBUG = True