diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 15d93fb..16dfd2b 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.7
+current_version = 1.1.8b0
 parse = (?P<major>\d+)(\.(?P<minor>\d+))(\.(?P<patch>\d+))(?P<release>[bf]*)(?P<build>\d*)
 commit = True
 tag = True
diff --git a/custom_components/mega/light.py b/custom_components/mega/light.py
index 6ee78e0..5e2b7a6 100644
--- a/custom_components/mega/light.py
+++ b/custom_components/mega/light.py
@@ -244,9 +244,12 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
     async def set_color(self, _before, **kwargs):
         transition = kwargs.get('transition')
         update_state = transition is not None and transition > 3
+        _after = None
         for item, value in kwargs.items():
             setattr(self, f'_{item}', value)
-        _after = self.get_rgbw()
+            if item == 'rgb_color':
+                _after = value
+        _after = _after or self.get_rgbw()
         self._rgb_color = tuple(_after[:3])
         if transition is None:
             transition = self.smooth.total_seconds()
diff --git a/custom_components/mega/manifest.json b/custom_components/mega/manifest.json
index ae3d3f7..4acd29e 100644
--- a/custom_components/mega/manifest.json
+++ b/custom_components/mega/manifest.json
@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v1.1.7"
+  "version": "v1.1.8b0"
 }
\ No newline at end of file