diff --git a/thorlcr/master/thgraphmanager.cpp b/thorlcr/master/thgraphmanager.cpp
index f41ea24278d..de54755cba5 100644
--- a/thorlcr/master/thgraphmanager.cpp
+++ b/thorlcr/master/thgraphmanager.cpp
@@ -1456,6 +1456,10 @@ void thorMain(ILogMsgHandler *logHandler, const char *wuid, const char *graphNam
                             {
                                 if (!streq(currentWuid, wuid))
                                 {
+                                    queryLogMsgManager()->removeJobId(thorJob.queryJobID());
+                                    LogMsgJobId thorJobId = queryLogMsgManager()->addJobId(wuid);
+                                    thorJob.setJobID(thorJobId);
+                                    setDefaultJobId(thorJobId);
                                     // perhaps slightly overkill, but avoid checking/locking wuid to add pod info.
                                     // if this instance has already done so.
                                     auto it = publishedPodWuids.find(wuid.str());