diff --git a/BuildingBlocks/src/BuildingBlocks.SDK/Endpoints/Common/EndpointClient.cs b/BuildingBlocks/src/BuildingBlocks.SDK/Endpoints/Common/EndpointClient.cs
index 839533f4c5..bb9e341560 100644
--- a/BuildingBlocks/src/BuildingBlocks.SDK/Endpoints/Common/EndpointClient.cs
+++ b/BuildingBlocks/src/BuildingBlocks.SDK/Endpoints/Common/EndpointClient.cs
@@ -148,7 +148,7 @@ private async Task<CachedApiResponse<T>> ExecuteCached<T>(HttpRequestMessage req
         deserializedResponseContent!.Status = statusCode;
         deserializedResponseContent.RawContent = await response.Content.ReadAsStringAsync();
         deserializedResponseContent.ContentType = response.Content.Headers.ContentType?.MediaType;
-        deserializedResponseContent.ETag = response.Headers.ETag!.Tag; //TODO: Timo (Is it safe to assume that the ETag is non-null?)
+        deserializedResponseContent.ETag = response.Headers.ETag!.Tag;
 
         return deserializedResponseContent;
     }