diff --git a/tasks/checks.yml b/tasks/checks.yml
index 92d062dcafe406d5ec413a17d5bb8efcfc95e1eb..c5b05d1831be69e1d46dcbd7a5a94587271df5ab 100644
--- a/tasks/checks.yml
+++ b/tasks/checks.yml
@@ -69,14 +69,6 @@
         var: php_versions_remove
         verbosity: 2
 
-    - name: Include SAPI checks for PHP versions due to be removed
-      include_tasks: sapi_checks.yml
-      loop: "{{ php_versions_remove }}"
-      loop_control:
-        loop_var: version
-        label: "{{ version }}"
-      when: ( php_versions_remove is defined ) and ( php_versions_remove != [] )
-
     - name: Generate an array of absent PHP versions
       set_fact:
         php_versions_absent: "{{ php_versions_absent | default([]) }} + [ '{{ absent_version.key }}' ]"
@@ -91,13 +83,25 @@
         var: php_versions_absent
         verbosity: 2
 
+    - name: Include SAPI checks for PHP versions due to be removed
+      include_tasks: sapi_checks.yml
+      loop: "{{ php_versions_remove }}"
+      loop_control:
+        loop_var: version
+        label: "{{ version }}"
+      when:
+        - ( php_versions[version].sapis is defined 
+        - ( php_versions_remove is defined ) and ( php_versions_remove != [] )
+
     - name: Include SAPI checks for PHP versions due to be absent
       include_tasks: sapi_checks.yml
       loop: "{{ php_versions_absent }}"
       loop_control:
         loop_var: version
         label: "{{ version }}"
-      when: ( php_versions_absent is defined ) and ( php_versions_absent != [] )
+      when:
+        - ( php_versions[version].sapis is defined 
+        - ( php_versions_absent is defined ) and ( php_versions_absent != [] )
 
     - name: Include SAPI checks for PHP proposed versions
       include_tasks: sapi_checks.yml