diff --git a/pkg/unikontainers/hypervisors/firecracker.go b/pkg/unikontainers/hypervisors/firecracker.go
index 9588a45b..51586b46 100644
--- a/pkg/unikontainers/hypervisors/firecracker.go
+++ b/pkg/unikontainers/hypervisors/firecracker.go
@@ -77,6 +77,9 @@ type FirecrackerConfig struct {
 }
 
 func (fc *Firecracker) Signal(pid int, signal unix.Signal) error {
+	if signal == unix.SIGTERM || signal == unix.SIGINT {
+		return fc.Stop(pid)
+	}
 	return unix.Kill(pid, signal)
 }