diff --git a/internal/executor/executor.go b/internal/executor/executor.go
index f05c9b1..8a770ce 100644
--- a/internal/executor/executor.go
+++ b/internal/executor/executor.go
@@ -4,6 +4,7 @@ import (
 	acl "github.com/OliveTin/OliveTin/internal/acl"
 	config "github.com/OliveTin/OliveTin/internal/config"
 	sv "github.com/OliveTin/OliveTin/internal/stringvariables"
+	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 
 	"bytes"
@@ -123,6 +124,12 @@ func (e *Executor) ExecRequest(req *ExecutionRequest) (*sync.WaitGroup, string)
 		ActionIcon:          "💩",
 	}
 
+	_, foundLog := e.Logs[req.TrackingID]
+
+	if foundLog || req.TrackingID == "" {
+		req.TrackingID = uuid.NewString()
+	}
+
 	e.Logs[req.TrackingID] = req.logEntry
 
 	wg := new(sync.WaitGroup)