diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index 3136c562a39..149879c328b 100644
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -166,7 +166,12 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all
     }
 }
 
-// Trigger report viewed event.
-$report->viewed();
+if (isset($report)) {
+    // Trigger report viewed event.
+    $report->viewed();
+} else {
+    echo html_writer::tag('div', '', array('class' => 'clearfix'));
+    echo $OUTPUT->notification(get_string('nostudentsyet'));
+}
 
 echo $OUTPUT->footer();
diff --git a/grade/report/user/styles.css b/grade/report/user/styles.css
index 76959953889..64ee46ae8cb 100644
--- a/grade/report/user/styles.css
+++ b/grade/report/user/styles.css
@@ -1,5 +1,6 @@
 .path-grade-report-user #graded_users_selector {
     float: right;
+    margin-bottom: 5px;
 }
 .path-grade-report-user #graded_users_selector .singleselect label {
     display: inline-block;
diff --git a/grade/report/user/tests/behat/view_usereport.feature b/grade/report/user/tests/behat/view_usereport.feature
new file mode 100644
index 00000000000..b4051b86d58
--- /dev/null
+++ b/grade/report/user/tests/behat/view_usereport.feature
@@ -0,0 +1,20 @@
+@core @core_grades @gradereport_user
+Feature: We can use the user report
+  As a user
+  I browse to the User report
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1 | 0 |
+
+    Scenario: Verify we can view a user grade report with no users enrolled.
+      Given I log in as "admin"
+      And I am on site homepage
+      And I follow "Course 1"
+      And I navigate to "Grades" node in "Course administration"
+      And I select "User report" from the "Grade report" singleselect
+      And I press "Go"
+      And I select "All users (0)" from the "Select all or one user" singleselect
+      And I click on "Go" "button" in the "#choosegradeuser" "css_element"
+      Then I should see "No students enrolled in this course yet"