diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 0b8fe8a8d27..e76dd61099b 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -140,7 +140,8 @@ class assignment_upload extends assignment_base {
         $submission = $this->get_submission($USER->id);
 
         $struploadafile = get_string('uploadafile');
-        $strmaxsize = get_string('maxsize', '', display_size($this->assignment->maxbytes));
+        $maxbytes = $this->assignment->maxbytes == 0 ? $this->course->maxbytes : $this->assignment->maxbytes; 
+        $strmaxsize = get_string('maxsize', '', display_size($maxbytes));
 
         if ($this->is_finalized($submission)) {
             // no uploading
diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php
index 491538e9189..63375a72cb0 100644
--- a/mod/assignment/type/uploadsingle/assignment.class.php
+++ b/mod/assignment/type/uploadsingle/assignment.class.php
@@ -81,7 +81,9 @@ class assignment_uploadsingle extends assignment_base {
     function view_upload_form() {
         global $CFG;
         $struploadafile = get_string("uploadafile");
-        $strmaxsize = get_string("maxsize", "", display_size($this->assignment->maxbytes));
+
+        $maxbytes = $this->assignment->maxbytes == 0 ? $this->course->maxbytes : $this->assignment->maxbytes; 
+        $strmaxsize = get_string('maxsize', '', display_size($maxbytes));
 
         echo '<div style="text-align:center">';
         echo '<form enctype="multipart/form-data" method="post" '.