diff --git a/providers/aws/connection/awsec2ebsconn/provider.go b/providers/aws/connection/awsec2ebsconn/provider.go
index 4f3927d168..4e14a0611a 100644
--- a/providers/aws/connection/awsec2ebsconn/provider.go
+++ b/providers/aws/connection/awsec2ebsconn/provider.go
@@ -153,6 +153,9 @@ func NewAwsEbsConnection(id uint32, conf *inventory.Config, asset *inventory.Ass
 			asset.Connections[0].Options["createdBy"] = "Mondoo"
 		}
 	}
+	if conf.Options[snapshot.NoSetup] == "true" {
+		conf.PlatformId = awsec2.MondooInstanceID(i.AccountID, targetRegion, convert.ToString(instanceinfo.InstanceId))
+	}
 	asset.PlatformIds = []string{conf.PlatformId}
 
 	// Mount Volume