diff --git a/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
index 511b34f1f6..b4561c3764 100644
--- a/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
+++ b/leshan-lwm2m-core/src/main/java/org/eclipse/leshan/core/response/ReadCompositeResponse.java
@@ -50,7 +50,7 @@ public ReadCompositeResponse(ResponseCode responseCode, Map<LwM2mPath, LwM2mNode
             TimestampedLwM2mNodes timestampedContent, String errorMessage, Object coapResponse) {
         super(responseCode, errorMessage, coapResponse);
 
-        if (timestampedContent != null) {
+        if (timestampedContent != null && isSuccess()) {
             // Handle if timestamped value is passed
 
             // check that we don't pass content too.
@@ -78,7 +78,7 @@ public ReadCompositeResponse(ResponseCode responseCode, Map<LwM2mPath, LwM2mNode
             // handle if content (not timestamped) value is passed
 
             // check content is not null
-            if (content == null) {
+            if (content == null && isSuccess()) {
                 throw new IllegalArgumentException("content OR timestampedValue should be not null");
             }