diff --git a/mod/scorm/datamodels/scorm_13.js b/mod/scorm/datamodels/scorm_13.js
index 403c0459015..e0569fd007e 100644
--- a/mod/scorm/datamodels/scorm_13.js
+++ b/mod/scorm/datamodels/scorm_13.js
@@ -1202,7 +1202,7 @@ function SCORMapi1_3(def, cmiobj, cmiint, cmicommentsuser, cmicommentslms, scorm
         if (storetotaltime) {
             if (cmi.mode == 'normal') {
                 if (cmi.credit == 'credit') {
-                    if ((cmi.completion_threshold != null) && (cmi.progress_measure != null)) {
+                    if ((cmi.completion_threshold) && (cmi.progress_measure)) {
                         if (cmi.progress_measure >= cmi.completion_threshold) {
                             cmi.completion_status = 'completed';
                         } else {
diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php
index e6186a5c1a1..b8832238833 100644
--- a/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@ -1263,22 +1263,22 @@ function get_scorm_default (&$userdata, $scorm, $scoid, $attempt, $mode) {
     $def['cmi.exit'] = scorm_isset($userdata, 'cmi.exit');
     $def['cmi.credit'] = scorm_isset($userdata, 'credit');
     $def['cmi.completion_status'] = scorm_isset($userdata, 'cmi.completion_status', 'unknown');
-    $def['cmi.completion_threshold'] = scorm_isset($userdata, 'threshold', 'null');
-    $def['cmi.learner_preference.audio_level'] = scorm_isset($userdata, 'cmi.learner_preference.audio_level', "'1'");
-    $def['cmi.learner_preference.language'] = scorm_isset($userdata, 'cmi.learner_preference.language', "''");
-    $def['cmi.learner_preference.delivery_speed'] = scorm_isset($userdata, 'cmi.learner_preference.delivery_speed', "'1'");
-    $def['cmi.learner_preference.audio_captioning'] = scorm_isset($userdata, 'cmi.learner_preference.audio_captioning', "'0'");
-    $def['cmi.location'] = scorm_isset($userdata, 'cmi.location', 'null');
-    $def['cmi.max_time_allowed'] = scorm_isset($userdata, 'attemptAbsoluteDurationLimit', 'null');
-    $def['cmi.progress_measure'] = scorm_isset($userdata, 'cmi.progress_measure', 'null');
-    $def['cmi.scaled_passing_score'] = scorm_isset($userdata, 'cmi.scaled_passing_score', 'null');
-    $def['cmi.score.scaled'] = scorm_isset($userdata, 'cmi.score.scaled', 'null');
-    $def['cmi.score.raw'] = scorm_isset($userdata, 'cmi.score.raw', 'null');
-    $def['cmi.score.min'] = scorm_isset($userdata, 'cmi.score.min', 'null');
-    $def['cmi.score.max'] = scorm_isset($userdata, 'cmi.score.max', 'null');
+    $def['cmi.completion_threshold'] = scorm_isset($userdata, 'threshold');
+    $def['cmi.learner_preference.audio_level'] = scorm_isset($userdata, 'cmi.learner_preference.audio_level', 1);
+    $def['cmi.learner_preference.language'] = scorm_isset($userdata, 'cmi.learner_preference.language');
+    $def['cmi.learner_preference.delivery_speed'] = scorm_isset($userdata, 'cmi.learner_preference.delivery_speed');
+    $def['cmi.learner_preference.audio_captioning'] = scorm_isset($userdata, 'cmi.learner_preference.audio_captioning', 0);
+    $def['cmi.location'] = scorm_isset($userdata, 'cmi.location');
+    $def['cmi.max_time_allowed'] = scorm_isset($userdata, 'attemptAbsoluteDurationLimit');
+    $def['cmi.progress_measure'] = scorm_isset($userdata, 'cmi.progress_measure');
+    $def['cmi.scaled_passing_score'] = scorm_isset($userdata, 'cmi.scaled_passing_score');
+    $def['cmi.score.scaled'] = scorm_isset($userdata, 'cmi.score.scaled');
+    $def['cmi.score.raw'] = scorm_isset($userdata, 'cmi.score.raw');
+    $def['cmi.score.min'] = scorm_isset($userdata, 'cmi.score.min');
+    $def['cmi.score.max'] = scorm_isset($userdata, 'cmi.score.max');
     $def['cmi.success_status'] = scorm_isset($userdata, 'cmi.success_status', 'unknown');
-    $def['cmi.suspend_data'] = scorm_isset($userdata, 'cmi.suspend_data', 'null');
-    $def['cmi.time_limit_action'] = scorm_isset($userdata, 'timelimitaction', 'null');
+    $def['cmi.suspend_data'] = scorm_isset($userdata, 'cmi.suspend_data');
+    $def['cmi.time_limit_action'] = scorm_isset($userdata, 'timelimitaction');
     $def['cmi.total_time'] = scorm_isset($userdata, 'cmi.total_time', 'PT0H0M0S');
 
     return $def;