diff --git a/esp/bindings/http/platform/httptransport.cpp b/esp/bindings/http/platform/httptransport.cpp
index 6ff68f380e8..7491e6f2703 100644
--- a/esp/bindings/http/platform/httptransport.cpp
+++ b/esp/bindings/http/platform/httptransport.cpp
@@ -1942,9 +1942,13 @@ void CHttpRequest::updateContext()
         m_context->setAcceptLanguage(acceptLanguage.str());
         StringBuffer callerId, globalId;
         getHeader(HTTP_HEADER_HPCC_GLOBAL_ID, globalId);
+        if (globalId.isEmpty())
+            getHeader("hpcc-global-id", globalId);
         if(globalId.length())
             m_context->setGlobalId(globalId);
         getHeader(HTTP_HEADER_HPCC_CALLER_ID, callerId);
+        if (callerId.isEmpty())
+            getHeader("hpcc-caller-id", callerId);
         if(callerId.length())
             m_context->setCallerId(callerId);
     }