diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 07392fddd96..9a7fc4911fd 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1606,14 +1606,15 @@ class CyclesPreferences(bpy.types.AddonPreferences):
         compute_device_type = self.get_compute_device_type()
 
         # We need non-CPU devices, used for rendering and supporting OIDN GPU denoising
-        for device in _cycles.available_devices(compute_device_type):
-            device_type = device[1]
-            if device_type == 'CPU':
-                continue
+        if compute_device_type != 'NONE':
+            for device in _cycles.available_devices(compute_device_type):
+                device_type = device[1]
+                if device_type == 'CPU':
+                    continue
 
-            has_device_oidn_support = device[5]
-            if has_device_oidn_support and self.find_existing_device_entry(device).use:
-                return True
+                has_device_oidn_support = device[5]
+                if has_device_oidn_support and self.find_existing_device_entry(device).use:
+                    return True
 
         return False