diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 3a8773cb252..51248fd1edb 100644
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -679,8 +679,8 @@ function scorm_course_format_display($user, $course) {
             print_error('invalidcoursemodule');
         }
         $contextmodule = get_context_instance(CONTEXT_MODULE, $cm->id);
-        if ((has_capability('mod/scorm:skipview', $contextmodule)) && scorm_simple_play($scorm, $user, $contextmodule)) {
-            exit;
+        if ((has_capability('mod/scorm:skipview', $contextmodule))) {
+            scorm_simple_play($scorm, $user, $contextmodule);
         }
         $colspan = '';
         $headertext = '<table width="100%"><tr><td class="title">'.get_string('name').': <b>'.format_string($scorm->name).'</b>';
diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index 7e6490d64a5..42c5c588d80 100644
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -71,8 +71,8 @@ $pagetitle = strip_tags($course->shortname.': '.format_string($scorm->name));
 
 add_to_log($course->id, 'scorm', 'pre-view', 'view.php?id='.$cm->id, "$scorm->id", $cm->id);
 
-if ((has_capability('mod/scorm:skipview', $contextmodule)) && scorm_simple_play($scorm, $USER, $contextmodule)) {
-    exit;
+if ((has_capability('mod/scorm:skipview', $contextmodule))) {
+    scorm_simple_play($scorm, $USER, $contextmodule);
 }
 
 //