diff --git a/src/lib/orionld/notifications/notificationSend.cpp b/src/lib/orionld/notifications/notificationSend.cpp
index b1d3683e28..868e5f641c 100644
--- a/src/lib/orionld/notifications/notificationSend.cpp
+++ b/src/lib/orionld/notifications/notificationSend.cpp
@@ -85,14 +85,6 @@ size_t  userAgentHeaderLen = 0;  // Set in orionldServiceInit()
 
 
 
-// -----------------------------------------------------------------------------
-//
-// static buffer for small notifications (payload body)
-//
-static __thread char body[4 * 1024];
-
-
-
 // -----------------------------------------------------------------------------
 //
 // attributeToSimplified - move to its own module
@@ -699,7 +691,7 @@ int notificationSend(OrionldAlterationMatch* mAltP, double timestamp, CURL** cur
   }
 
   long unsigned int  payloadBodySize  = kjFastRenderSize(notificationP);
-  char*              payloadBody      = (payloadBodySize < sizeof(body))? body : kaAlloc(&orionldState.kalloc, payloadBodySize);
+  char*              payloadBody      = kaAlloc(&orionldState.kalloc, payloadBodySize + 512);
 
   kjFastRender(notificationP, payloadBody);
 
diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test
index fde0289efe..ac00abab79 100644
--- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test
+++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test
@@ -268,7 +268,7 @@ Ngsild-Attribute-Format: Normalized
     ],
     "id": "urn:ngsi-ld:Notification:REGEX(.*)",
     "notifiedAt": "202REGEX(.*)Z",
-    "subscriptionId": "urn:S1",
+    "subscriptionId": "urn:S2",
     "type": "Notification"
 }
 =======================================