diff --git a/internal/api/atomicasset.go b/internal/api/atomicasset.go
index d4e3bf9..b3dc7e2 100644
--- a/internal/api/atomicasset.go
+++ b/internal/api/atomicasset.go
@@ -11,7 +11,8 @@ import (
 
 type AtomicAsset struct {
 	utils.Time
-	client     atomicasset.Client
+
+	url        string
 	block_time float64
 }
 
@@ -21,9 +22,7 @@ func AtomicAssetFactory(args ApiArguments) ApiInterface {
 
 func NewAtomicAsset(url string, block_time float64) AtomicAsset {
 	return AtomicAsset{
-		client: atomicasset.Client{
-			URL: url,
-		},
+		url:        url,
 		block_time: block_time,
 	}
 }
@@ -31,14 +30,15 @@ func NewAtomicAsset(url string, block_time float64) AtomicAsset {
 func (e AtomicAsset) LogInfo() LogParams {
 	return LogParams{
 		"type", "atomicasset",
-		"url", e.client.URL,
+		"url", e.url,
 		"block_time", e.block_time,
 	}
 }
 
 func (e AtomicAsset) Call(ctx context.Context) (agentcheck.Response, string) {
-	// TODO: Pass context
-	h, err := e.client.GetHealth()
+	client := atomicasset.NewWithContext(e.url, ctx)
+
+	h, err := client.GetHealth()
 	if err != nil {
 		resp := agentcheck.NewStatusMessageResponse(agentcheck.Fail, "")
 		return resp, err.Error()
diff --git a/internal/api/atomicasset_test.go b/internal/api/atomicasset_test.go
index 7066bcf..84d88db 100644
--- a/internal/api/atomicasset_test.go
+++ b/internal/api/atomicasset_test.go
@@ -20,8 +20,7 @@ func TestAtomicAsset_Factory(t *testing.T) {
 	expected := NewAtomicAsset("https://atomic.example.com", 60)
 
 	assert.IsType(t, expected, api)
-	assert.Equal(t, expected.client.URL, api.(AtomicAsset).client.URL)
-	assert.Equal(t, expected.client.Host, api.(AtomicAsset).client.Host)
+	assert.Equal(t, expected.url, api.(AtomicAsset).url)
 	assert.Equal(t, expected.block_time, api.(AtomicAsset).block_time)
 }