diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 5a9443896..3ab178fec 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1,3 +1,4 @@
 - Hardening: simplify implementation so typeInformation contains global config values (#1515)
 - Add: `POST /iot/op/delete` operation to delete multiple devices at once (#1578)
 - Fix: store device subscriptions updates (#1086)
+- Fix: badtimestamp error should not progress to ContextBroker
diff --git a/lib/services/ngsi/entities-NGSI-v2.js b/lib/services/ngsi/entities-NGSI-v2.js
index 95f0d5bfd..ce796a13a 100644
--- a/lib/services/ngsi/entities-NGSI-v2.js
+++ b/lib/services/ngsi/entities-NGSI-v2.js
@@ -315,6 +315,7 @@ function sendUpdateValueNgsi2(entityName, measures, typeInformation, token, call
                 timestamp.value = plainMeasures[constants.TIMESTAMP_ATTRIBUTE];
             } else {
                 callback(new errors.BadTimestamp(plainMeasures[constants.TIMESTAMP_ATTRIBUTE], entityName));
+                return;
             }
         } else if (!typeInformation.timezone) {
             timestamp.value = new Date().toISOString();