diff --git a/README.md b/README.md
index 8674495ba8..249dd164fa 100644
--- a/README.md
+++ b/README.md
@@ -1183,6 +1183,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 ### master (unreleased)
 
+* GetBootscriptID doesn't try to resolve when we pass an UUID
 * Add location fields for VPS
 * `scw ps` add commercial-type column
 * Use `SCW_SECURE_EXEC` instead of `exec_exec`
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 05e6897206..be913690c0 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -2440,6 +2440,10 @@ func (s *ScalewayAPI) GetQuotas() (*ScalewayGetQuotas, error) {
 // GetBootscriptID returns exactly one bootscript matching
 func (s *ScalewayAPI) GetBootscriptID(needle, arch string) (string, error) {
 	// Parses optional type prefix, i.e: "bootscript:name" -> "name"
+	if anonuuid.IsUUID(needle) == nil {
+		return needle, nil
+	}
+
 	_, needle = parseNeedle(needle)
 
 	bootscripts, err := s.ResolveBootscript(needle)