diff --git a/drivers/SmartThings/matter-thermostat/profiles/thermostat-modular.yml b/drivers/SmartThings/matter-thermostat/profiles/thermostat-modular.yml
index 1e7bd97dc7..7d3dd309f2 100644
--- a/drivers/SmartThings/matter-thermostat/profiles/thermostat-modular.yml
+++ b/drivers/SmartThings/matter-thermostat/profiles/thermostat-modular.yml
@@ -9,6 +9,9 @@ components:
       - id: fanMode
         version: 1
         optional: true
+      - id: fanSpeedPercent
+        version: 1
+        optional: true
       - id: fanOscillationMode
         version: 1
         optional: true
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua
index a8acdc253e..2660f75b6e 100644
--- a/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua
+++ b/drivers/SmartThings/matter-thermostat/src/test/test_matter_thermo_multiple_device_types.lua
@@ -3,6 +3,7 @@
 
 local test = require "integration_test"
 local t_utils = require "integration_test.utils"
+local capabilities = require "st.capabilities"
 local clusters = require "st.matter.clusters"
 local uint32 = require "st.matter.data_types.Uint32"
 
@@ -196,6 +197,7 @@ local expected_metadata = {
       "main",
       {
         "relativeHumidityMeasurement",
+        "fanSpeedPercent",
         "fanMode",
         "fanOscillationMode",
         "thermostatHeatingSetpoint",
@@ -220,6 +222,7 @@ local new_cluster_subscribe_list = {
   clusters.RelativeHumidityMeasurement.attributes.MeasuredValue,
   clusters.FanControl.attributes.FanMode,
   clusters.FanControl.attributes.FanModeSequence,
+  clusters.FanControl.attributes.PercentCurrent,
   clusters.FanControl.attributes.RockSupport,  -- These two attributes will be subscribed to following the profile
   clusters.FanControl.attributes.RockSetting,  -- change since the fanOscillationMode capability will be enabled.
 }
@@ -241,4 +244,35 @@ test.register_coroutine_test(
   { test_init = test_init_disorder_endpoints }
 )
 
+test.register_coroutine_test(
+  "PercentCurrent reports and setPercent commands should be handled correctly after profile change",
+  function()
+    test_thermostat_device_type_update_modular_profile(mock_device, expected_metadata,
+      get_subscribe_request(mock_device, new_cluster_subscribe_list))
+
+    test.wait_for_events()
+
+    test.socket.matter:__queue_receive({
+      mock_device.id,
+      clusters.FanControl.attributes.PercentCurrent:build_test_report_data(mock_device, 2, 10)
+    })
+
+    test.socket.capability:__expect_send(
+      mock_device:generate_test_message("main", capabilities.fanSpeedPercent.percent(10))
+    )
+
+    test.wait_for_events()
+
+    test.socket.capability:__queue_receive({
+      mock_device.id,
+      { capability = "fanSpeedPercent", component = "main", command = "setPercent", args = { 50 } }
+    })
+
+    test.socket.matter:__expect_send({
+      mock_device.id,
+      clusters.FanControl.attributes.PercentSetting:write(mock_device, 2, 50)
+    })
+  end
+)
+
 test.run_registered_tests()
diff --git a/drivers/SmartThings/matter-thermostat/src/thermostat_utils/device_configuration.lua b/drivers/SmartThings/matter-thermostat/src/thermostat_utils/device_configuration.lua
index 102b6e8d3b..3ae5c76c7e 100644
--- a/drivers/SmartThings/matter-thermostat/src/thermostat_utils/device_configuration.lua
+++ b/drivers/SmartThings/matter-thermostat/src/thermostat_utils/device_configuration.lua
@@ -200,7 +200,14 @@ function DeviceConfiguration.match_modular_profile_thermostat(device)
   local wind_eps = device:get_endpoints(clusters.FanControl.ID, {feature_bitmap = clusters.FanControl.types.FanControlFeature.WIND})
 
   if #fan_eps > 0 then
-    table.insert(main_component_capabilities, capabilities.fanMode.ID)
+    if #device:get_endpoints(clusters.FanControl.ID, {feature_bitmap = clusters.FanControl.types.Feature.MULTI_SPEED}) > 0 then
+      table.insert(main_component_capabilities, capabilities.fanSpeedPercent.ID)
+      if #device:get_endpoints(clusters.FanControl.ID, {feature_bitmap = clusters.FanControl.types.Feature.AUTO}) > 0 then
+        table.insert(main_component_capabilities, capabilities.fanMode.ID)
+      end
+    else
+      table.insert(main_component_capabilities, capabilities.fanMode.ID)
+    end
   end
   if #rock_eps > 0 then
     table.insert(main_component_capabilities, capabilities.fanOscillationMode.ID)