diff --git a/src/app/util/af-enums.h b/src/app/util/af-enums.h
index ec12dab91d2289..195def3c87f1e6 100644
--- a/src/app/util/af-enums.h
+++ b/src/app/util/af-enums.h
@@ -38,7 +38,6 @@ enum EmberAfStatus : uint8_t
     EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE    = 0x86,
     EMBER_ZCL_STATUS_CONSTRAINT_ERROR         = 0x87,
     EMBER_ZCL_STATUS_UNSUPPORTED_WRITE        = 0x88,
-    EMBER_ZCL_STATUS_READ_ONLY                = 0x88, // Deprecated; same as UNSUPPORTED_WRITE
     EMBER_ZCL_STATUS_RESOURCE_EXHAUSTED       = 0x89,
     EMBER_ZCL_STATUS_INSUFFICIENT_SPACE       = 0x89, // Deprecated; same as RESOURCE_EXHAUSTED
     EMBER_ZCL_STATUS_DUPLICATE_EXISTS         = 0x8A,
diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp
index 98b7d2ab9ddf8c..c657ba515b5e3f 100644
--- a/src/app/util/attribute-table.cpp
+++ b/src/app/util/attribute-table.cpp
@@ -216,7 +216,7 @@ static bool IsNullValue(const uint8_t * data, uint16_t dataLen, bool isAttribute
 //           device is not found in the attribute table)
 // - EMBER_ZCL_STATUS_INVALID_DATA_TYPE: if the data type passed in doesnt match the type
 //           stored in the attribute table
-// - EMBER_ZCL_STATUS_READ_ONLY: if the attribute isnt writable
+// - EMBER_ZCL_STATUS_UNSUPPORTED_WRITE: if the attribute isnt writable
 // - EMBER_ZCL_STATUS_CONSTRAINT_ERROR: if the value is set out of the allowable range for
 //           the attribute
 // - EMBER_ZCL_STATUS_SUCCESS: if the attribute was found and successfully written
@@ -267,7 +267,7 @@ EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attribu
         {
             emberAfAttributesPrintln("%pattr not writable", "WRITE ERR: ");
             emberAfAttributesFlush();
-            return EMBER_ZCL_STATUS_READ_ONLY;
+            return EMBER_ZCL_STATUS_UNSUPPORTED_WRITE;
         }
     }