diff --git a/pkg/compose/hook.go b/pkg/compose/hook.go
index 0681e50799..54e55652cc 100644
--- a/pkg/compose/hook.go
+++ b/pkg/compose/hook.go
@@ -102,7 +102,7 @@ func (s composeService) runWaitExec(ctx context.Context, execID string, service
 		TTY:    service.Tty,
 	})
 	if err != nil {
-		return nil
+		return err
 	}
 
 	// We miss a ContainerExecWait API
diff --git a/pkg/compose/hook_test.go b/pkg/compose/hook_test.go
index b42e9539ea..9c085082b5 100644
--- a/pkg/compose/hook_test.go
+++ b/pkg/compose/hook_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 /*
    Copyright 2020 Docker Compose CLI authors