diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index bb69dfcc6f..85eeb72c24 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -337,17 +337,14 @@ def modx_dispatch(request, dispatch=None, id=None, course_id=None):
     '''
     # ''' (fix emacs broken parsing)
 
-    # TODO: Should be in settings.py
-    MAX_UPLOAD_FILE_SIZE = 4*1000*1000 # 4 MB
-
-    # Check for submitted files
+    # Check for submitted files and basic file size checks
     p = request.POST.copy()
     if request.FILES:
         for inputfile_id in request.FILES.keys():
             inputfile = request.FILES[inputfile_id]
-            if inputfile.size > MAX_UPLOAD_FILE_SIZE:
+            if inputfile.size > settings.STUDENT_FILEUPLOAD_MAX_SIZE: # Bytes
                 file_too_big_msg = 'Submission aborted! Your file "%s" is too large (max size: %d MB)' %\
-                                    (inputfile.name, MAX_UPLOAD_FILE_SIZE/(1000**2))
+                                    (inputfile.name, settings.STUDENT_FILEUPLOAD_MAX_SIZE/(1000**2))
                 return HttpResponse(json.dumps({'success': file_too_big_msg}))
             p[inputfile_id] = inputfile
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 8ebf72f22a..24a70e3e45 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -128,6 +128,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.csrf', #necessary for csrf protection
 )
 
+STUDENT_FILEUPLOAD_MAX_SIZE = 4*1000*1000 # 4 MB
 
 # FIXME:
 # We should have separate S3 staged URLs in case we need to make changes to