diff --git a/mod/workshop/lang/en/workshop.php b/mod/workshop/lang/en/workshop.php
index c7bea5ef07a..2346da16e83 100644
--- a/mod/workshop/lang/en/workshop.php
+++ b/mod/workshop/lang/en/workshop.php
@@ -282,6 +282,8 @@ $string['submissiongrade'] = 'Grade for submission';
 $string['submissiongrade_help'] = 'This setting specifies the maximum grade that may be obtained for submitted work.';
 $string['submissiongradeof'] = 'Grade for submission (of {$a})';
 $string['submissionlastmodified'] = 'Last modified';
+$string['submissionrequiredcontent'] = 'Please enter text here or upload a file';
+$string['submissionrequiredfile'] = 'Please upload a file or enter text in submission content box';
 $string['submissionsettings'] = 'Submission settings';
 $string['submissionstart'] = 'Open for submissions from';
 $string['submissionstartevent'] = '{$a} (opens for submissions)';
diff --git a/mod/workshop/submission_form.php b/mod/workshop/submission_form.php
index 398cd4a4ba7..f6c827094ea 100644
--- a/mod/workshop/submission_form.php
+++ b/mod/workshop/submission_form.php
@@ -88,6 +88,12 @@ class workshop_submission_form extends moodleform {
             }
         }
 
+        $getfiles = file_get_drafarea_files($data['attachment_filemanager']);
+        if (empty($getfiles->list) and html_is_blank($data['content_editor']['text'])) {
+            $errors['content_editor'] = get_string('submissionrequiredcontent', 'mod_workshop');
+            $errors['attachment_filemanager'] = get_string('submissionrequiredfile', 'mod_workshop');
+        }
+
         if (isset($data['attachment_filemanager']) and isset($this->_customdata['workshop']->submissionfiletypes)) {
             $whitelist = workshop::normalize_file_extensions($this->_customdata['workshop']->submissionfiletypes);
             if ($whitelist) {