diff --git a/DebugProbe.AspNetCore/DebugProbe.AspNetCore.csproj b/DebugProbe.AspNetCore/DebugProbe.AspNetCore.csproj
index 1d03abf..6660a3e 100644
--- a/DebugProbe.AspNetCore/DebugProbe.AspNetCore.csproj
+++ b/DebugProbe.AspNetCore/DebugProbe.AspNetCore.csproj
@@ -7,7 +7,7 @@
 
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageId>DebugProbe.AspNetCore</PackageId>
-		<Version>1.3.0-preview.1</Version>
+		<Version>1.3.0-preview.2</Version>
 
 		<Authors>Georgi Hristov</Authors>
 		<Description>Debug and inspect HTTP requests and responses inside ASP.NET Core apps. Capture, analyze, and compare API calls with a built-in UI.</Description>
diff --git a/DebugProbe.AspNetCore/Middleware/DebugProbeMiddleware.cs b/DebugProbe.AspNetCore/Middleware/DebugProbeMiddleware.cs
index 9709b86..2e9aa48 100644
--- a/DebugProbe.AspNetCore/Middleware/DebugProbeMiddleware.cs
+++ b/DebugProbe.AspNetCore/Middleware/DebugProbeMiddleware.cs
@@ -6,6 +6,7 @@
 using DebugProbe.AspNetCore.Models;
 using DebugProbe.AspNetCore.Storage;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Controllers;
 
 namespace DebugProbe.AspNetCore.Middleware;
 
@@ -24,10 +25,12 @@ public DebugProbeMiddleware(RequestDelegate next)
 
     public async Task Invoke(HttpContext context, DebugEntryStore store)
     {
-        /// Skips DebugProbe endpoints to avoid self-tracking.
-        if (context.Request.Path.StartsWithSegments("/debug") ||
-            context.Request.Path.StartsWithSegments("/debugprobe") ||
-            context.Request.Path.StartsWithSegments("/favicon.ico"))
+        var endpoint = context.GetEndpoint();
+
+        var isApiEndpoint =
+            endpoint?.Metadata.GetMetadata<ControllerActionDescriptor>() is not null;
+
+        if (!isApiEndpoint)
         {
             await _next(context);
             return;