diff --git a/docs/ERROR_CODES.md b/docs/ERROR_CODES.md
index 694208e93b82ce..bf3e252369efb3 100644
--- a/docs/ERROR_CODES.md
+++ b/docs/ERROR_CODES.md
@@ -61,7 +61,6 @@ This file was **AUTOMATICALLY** generated by
 | 49      | 0x31 | `CHIP_ERROR_INVALID_DATA_LIST`                     |
 | 50      | 0x32 | `CHIP_ERROR_TIMEOUT`                               |
 | 51      | 0x33 | `CHIP_ERROR_INVALID_DEVICE_DESCRIPTOR`             |
-| 53      | 0x35 | `CHIP_ERROR_END_OF_INPUT`                          |
 | 56      | 0x38 | `CHIP_ERROR_INVALID_PASE_PARAMETER`                |
 | 59      | 0x3B | `CHIP_ERROR_INVALID_USE_OF_SESSION_KEY`            |
 | 60      | 0x3C | `CHIP_ERROR_CONNECTION_CLOSED_UNEXPECTEDLY`        |
diff --git a/src/lib/core/CHIPError.cpp b/src/lib/core/CHIPError.cpp
index 87fdced8439852..d28242d8176723 100644
--- a/src/lib/core/CHIPError.cpp
+++ b/src/lib/core/CHIPError.cpp
@@ -215,9 +215,6 @@ bool FormatCHIPError(char * buf, uint16_t bufSize, CHIP_ERROR err)
     case CHIP_ERROR_INVALID_DEVICE_DESCRIPTOR.AsInteger():
         desc = "Invalid device descriptor";
         break;
-    case CHIP_END_OF_INPUT.AsInteger():
-        desc = "End of input";
-        break;
     case CHIP_ERROR_INVALID_PASE_PARAMETER.AsInteger():
         desc = "Invalid PASE parameter";
         break;
diff --git a/src/lib/core/CHIPError.h b/src/lib/core/CHIPError.h
index eb5d0d04188e89..4faf0da397c063 100644
--- a/src/lib/core/CHIPError.h
+++ b/src/lib/core/CHIPError.h
@@ -845,17 +845,7 @@ using CHIP_ERROR = ::chip::ChipError;
 #define CHIP_ERROR_INVALID_DEVICE_DESCRIPTOR                   CHIP_CORE_ERROR(0x33)
 
 // AVAILABLE: 0x34
-
-/**
- *  @def CHIP_END_OF_INPUT
- *
- *  @brief
- *    An input ended.
- *
- */
-#define CHIP_ERROR_END_OF_INPUT                                CHIP_CORE_ERROR(0x35)
-#define CHIP_END_OF_INPUT CHIP_ERROR_END_OF_INPUT
-
+// AVAILABLE: 0x35
 // AVAILABLE: 0x36
 // AVAILABLE: 0x37
 
diff --git a/src/lib/core/tests/TestCHIPErrorStr.cpp b/src/lib/core/tests/TestCHIPErrorStr.cpp
index d731a47cdbf193..2f3b9a8689bd6d 100644
--- a/src/lib/core/tests/TestCHIPErrorStr.cpp
+++ b/src/lib/core/tests/TestCHIPErrorStr.cpp
@@ -93,7 +93,6 @@ static const CHIP_ERROR kTestElements[] =
     CHIP_ERROR_INVALID_DATA_LIST,
     CHIP_ERROR_TIMEOUT,
     CHIP_ERROR_INVALID_DEVICE_DESCRIPTOR,
-    CHIP_END_OF_INPUT,
     CHIP_ERROR_INVALID_PASE_PARAMETER,
     CHIP_ERROR_INVALID_USE_OF_SESSION_KEY,
     CHIP_ERROR_CONNECTION_CLOSED_UNEXPECTEDLY,