diff --git a/code/espurna/light.cpp b/code/espurna/light.cpp
index 4dde18fb..87ca5435 100644
--- a/code/espurna/light.cpp
+++ b/code/espurna/light.cpp
@@ -2126,7 +2126,12 @@ bool _lightParsePayload(espurna::StringView payload) {
 }
 
 bool _lightTryParseChannel(espurna::StringView value, size_t& id) {
-    return tryParseIdPath(value, lightChannels(), id);
+    const auto channels = _light_channels.size();
+    if (std::find(value.begin(), value.end(), '/') != value.end()) {
+        return tryParseIdPath(value, channels, id);
+    }
+
+    return tryParseId(value, channels, id);
 }
 
 } // namespace