diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index ac9d5c6e6a7..57aac5550ef 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -2980,18 +2980,16 @@ class assign {
             if ($grade->grade !== null && $grade->grade >= 0) {
                 $data->grade = format_float($grade->grade, 2);
             }
+            if (!empty($flags->workflowstate)) {
+                $data->workflowstate = $flags->workflowstate;
+            }
+            if (!empty($flags->allocatedmarker)) {
+                $data->allocatedmarker = $flags->allocatedmarker;
+            }
         } else {
             $data = new stdClass();
             $data->grade = '';
         }
-
-        if (!empty($flags->workflowstate)) {
-            $data->workflowstate = $flags->workflowstate;
-        }
-        if (!empty($flags->allocatedmarker)) {
-            $data->allocatedmarker = $flags->allocatedmarker;
-        }
-
         // Warning if required.
         $allsubmissions = $this->get_all_submissions($userid);