diff --git a/src/backend/distributed/utils/errormessage.c b/src/backend/distributed/utils/errormessage.c
index 2482768e7..f2b69986e 100644
--- a/src/backend/distributed/utils/errormessage.c
+++ b/src/backend/distributed/utils/errormessage.c
@@ -6,6 +6,7 @@
  */
 
 #include "postgres.h"
+#include "utils/memutils.h"
 
 #include "distributed/citus_nodes.h"
 #include "distributed/errormessage.h"
@@ -54,5 +55,7 @@ RaiseDeferredErrorInternal(DeferredErrorMessage *error, int elevel)
 	errorData->lineno = error->linenumber;
 	errorData->funcname = error->functionname;
 
+	errorData->assoc_context = ErrorContext;
+
 	ThrowErrorData(errorData);
 }