diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2cbe6fd6807..5c1018102479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,9 @@ All notable changes to this project will be documented in this file.
 - Rule handling of JSON ``null`` regression from v8.5.0.1 (#9685)
 - Arilux RF remote detection regression from v8.3.0
 
+### Removed
+- Auto output selection of decimal or hexadecimal data based on user input. Now only based on ``SetOption17``
+
 ## [9.0.0.2] - 20201025
 ### Added
 - Support for Vietnamese language translations by Tâm.NT
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a8ed1e9708aa..1a8731a89d51 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -133,3 +133,4 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Support for direct upgrade from Tasmota versions before v7.0
 - Support for downgrade to versions before 9.0 keeping current GPIO configuration
 - Auto config update for all Friendlynames and Switchtopic from Tasmota versions before v8.0
+- Auto output selection of decimal or hexadecimal data based on user input. Now only based on ``SetOption17``
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index 5f8491dc0b24..d91666992be3 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -2556,9 +2556,12 @@ bool LightColorEntry(char *buffer, uint32_t buffer_length)
       entry_type = 1;                               // Hexadecimal
     }
   }
-  if (entry_type) {
-    Settings.flag.decimal_text = entry_type -1;     // SetOption17 - Switch between decimal or hexadecimal output
-  }
+
+//  Too much magic so removed since 9.0.0.3
+//  if (entry_type) {
+//    Settings.flag.decimal_text = entry_type -1;     // SetOption17 - Switch between decimal or hexadecimal output
+//  }
+
   return (entry_type);
 }