diff --git a/drivers/exec/driver.go b/drivers/exec/driver.go
index eca6e213b..391e44fda 100644
--- a/drivers/exec/driver.go
+++ b/drivers/exec/driver.go
@@ -496,8 +496,10 @@ func (d *Driver) SignalTask(taskID string, signal string) error {
 
 	sig := os.Interrupt
 	if s, ok := signals.SignalLookup[signal]; ok {
-		d.logger.Warn("signal to send to task unknown, using SIGINT", "signal", signal, "task_id", handle.taskConfig.ID)
 		sig = s
+	} else {
+		d.logger.Warn("unknown signal to send to task, using SIGINT instead", "signal", signal, "task_id", handle.taskConfig.ID)
+
 	}
 	return handle.exec.Signal(sig)
 }
diff --git a/drivers/java/driver.go b/drivers/java/driver.go
index 5a8a6a41a..3a4a808d9 100644
--- a/drivers/java/driver.go
+++ b/drivers/java/driver.go
@@ -524,8 +524,10 @@ func (d *Driver) SignalTask(taskID string, signal string) error {
 
 	sig := os.Interrupt
 	if s, ok := signals.SignalLookup[signal]; ok {
-		d.logger.Warn("signal to send to task unknown, using SIGINT", "signal", signal, "task_id", handle.taskConfig.ID)
 		sig = s
+	} else {
+		d.logger.Warn("unknown signal to send to task, using SIGINT instead", "signal", signal, "task_id", handle.taskConfig.ID)
+
 	}
 	return handle.exec.Signal(sig)
 }
diff --git a/drivers/rawexec/driver.go b/drivers/rawexec/driver.go
index 52cdf4794..bde086963 100644
--- a/drivers/rawexec/driver.go
+++ b/drivers/rawexec/driver.go
@@ -494,8 +494,9 @@ func (d *Driver) SignalTask(taskID string, signal string) error {
 	if s, ok := signals.SignalLookup[signal]; ok {
 		sig = s
 	} else {
-		d.logger.Warn("signal to send to task unknown, using SIGINT", "signal", signal, "task_id", handle.taskConfig.ID)
+		d.logger.Warn("unknown signal to send to task, using SIGINT instead", "signal", signal, "task_id", handle.taskConfig.ID)
 	}
+
 	return handle.exec.Signal(sig)
 }
 
diff --git a/drivers/rkt/driver.go b/drivers/rkt/driver.go
index 9cbeb79ec..6be617278 100644
--- a/drivers/rkt/driver.go
+++ b/drivers/rkt/driver.go
@@ -853,8 +853,10 @@ func (d *Driver) SignalTask(taskID string, signal string) error {
 
 	sig := os.Interrupt
 	if s, ok := signals.SignalLookup[signal]; ok {
-		d.logger.Warn("signal to send to task unknown, using SIGINT", "signal", signal, "task_id", handle.taskConfig.ID, "task_name", handle.taskConfig.Name)
 		sig = s
+	} else {
+		d.logger.Warn("unknown signal to send to task, using SIGINT instead", "signal", signal, "task_id", handle.taskConfig.ID, "task_name", handle.taskConfig.Name)
+
 	}
 	return handle.exec.Signal(sig)
 }