diff --git a/availability/condition/completion/classes/condition.php b/availability/condition/completion/classes/condition.php
index c032c83c45e..8503ef69ecc 100644
--- a/availability/condition/completion/classes/condition.php
+++ b/availability/condition/completion/classes/condition.php
@@ -277,13 +277,13 @@ class condition extends \core_availability\condition {
                 if (!isset($sectionprevious[$othercm->section])) {
                     $sectionprevious[$othercm->section] = $lastcmid;
                 }
+                if ($lastcmid) {
+                    $this->modfastprevious[$othercm->id] = $lastcmid;
+                }
                 // Load previous to all cms with completion.
                 if ($othercm->completion == COMPLETION_TRACKING_NONE) {
                     continue;
                 }
-                if ($lastcmid) {
-                    $this->modfastprevious[$othercm->id] = $lastcmid;
-                }
                 $lastcmid = $othercm->id;
             }
             // Fill empty sections index.