diff --git a/ironic/drivers/modules/redfish/raid.py b/ironic/drivers/modules/redfish/raid.py
index 809ec59c6f..154cd53d38 100644
--- a/ironic/drivers/modules/redfish/raid.py
+++ b/ironic/drivers/modules/redfish/raid.py
@@ -1120,7 +1120,9 @@ class RedfishRAID(base.RAIDInterface):
                 raid_configs['pending'].setdefault(controller, []).append(
                     logical_disk)
 
-        node.set_driver_internal_info('raid_configs', raid_configs)
+        # Store only when async operation
+        if reboot_required:
+            node.set_driver_internal_info('raid_configs', raid_configs)
 
         return raid_configs, reboot_required
 
@@ -1182,7 +1184,9 @@ class RedfishRAID(base.RAIDInterface):
                         response.task_monitor_uri)
                     reboot_required = True
 
-        node.set_driver_internal_info('raid_configs', raid_configs)
+        # Store only when async operation
+        if reboot_required:
+            node.set_driver_internal_info('raid_configs', raid_configs)
 
         return raid_configs, reboot_required
 
diff --git a/ironic/tests/unit/drivers/modules/redfish/test_raid.py b/ironic/tests/unit/drivers/modules/redfish/test_raid.py
index dfb3c1473d..843be735c9 100644
--- a/ironic/tests/unit/drivers/modules/redfish/test_raid.py
+++ b/ironic/tests/unit/drivers/modules/redfish/test_raid.py
@@ -336,6 +336,8 @@ class RedfishRAIDTestCase(db_base.DbTestCase):
             self.assertEqual(mock_node_power_action.call_count, 0)
             self.assertEqual(mock_build_agent_options.call_count, 0)
             self.assertEqual(mock_prepare_ramdisk.call_count, 0)
+            self.assertIsNone(
+                task.node.driver_internal_info.get('raid_configs'))
             self.assertEqual(
                 [{'controller': 'RAID controller 1',
                   'id': '1',
@@ -1066,6 +1068,8 @@ class RedfishRAIDTestCase(db_base.DbTestCase):
             self.assertEqual(mock_node_power_action.call_count, 0)
             self.assertEqual(mock_build_agent_options.call_count, 0)
             self.assertEqual(mock_prepare_ramdisk.call_count, 0)
+            self.assertIsNone(
+                task.node.driver_internal_info.get('raid_configs'))
             self.assertEqual([], task.node.raid_config['logical_disks'])
             self.assertNotEqual(
                 last_updated, task.node.raid_config['last_updated'])
diff --git a/releasenotes/notes/fix-nonetype-object-is-not-iterable-0592926d890d6c11.yaml b/releasenotes/notes/fix-nonetype-object-is-not-iterable-0592926d890d6c11.yaml
new file mode 100644
index 0000000000..ec9043adb0
--- /dev/null
+++ b/releasenotes/notes/fix-nonetype-object-is-not-iterable-0592926d890d6c11.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes ``'NoneType' object is not iterable`` in conductor logs for
+    ``redfish`` and ``idrac-redfish`` RAID clean and deploy steps. The message
+    should no longer appear. For affected nodes re-create the node or delete
+    ``raid_configs`` entry from ``driver_internal_info`` field.