diff --git a/packages/client-proxy/internal/proxy/proxy.go b/packages/client-proxy/internal/proxy/proxy.go
index 2b1afb4b0d..ba289b0244 100644
--- a/packages/client-proxy/internal/proxy/proxy.go
+++ b/packages/client-proxy/internal/proxy/proxy.go
@@ -57,7 +57,7 @@ func dnsResolution(sandboxId string, logger *zap.Logger) (string, error) {
 		// the api server wasn't found, maybe the API server is rolling and the DNS server is not updated yet
 		if dnsErr != nil || len(resp.Answer) == 0 {
 			err = dnsErr
-			logger.Warn(fmt.Sprintf("host for sandbox %s not found: %s", sandboxId, err), zap.Error(err), zap.Int("retry", i+1))
+			logger.Warn("host for sandbox not found", zap.Error(err), l.WithSandboxID(sandboxId), zap.Int("retry", i+1))
 
 			// Jitter
 			time.Sleep(time.Duration(rand.Intn(10)) * time.Millisecond)
@@ -76,7 +76,7 @@ func dnsResolution(sandboxId string, logger *zap.Logger) (string, error) {
 
 	// there's no answer, we can't proxy the request
 	if err != nil {
-		return "", ErrNodeNotFound
+		return "", fmt.Errorf("failed to resolve sandbox: %w", err)
 	}
 
 	return node, nil
diff --git a/packages/shared/pkg/proxy/handler.go b/packages/shared/pkg/proxy/handler.go
index 31ec61bd0f..7c71774085 100644
--- a/packages/shared/pkg/proxy/handler.go
+++ b/packages/shared/pkg/proxy/handler.go
@@ -8,6 +8,7 @@ import (
 
 	"go.uber.org/zap"
 
+	"github.com/e2b-dev/infra/packages/shared/pkg/logger"
 	"github.com/e2b-dev/infra/packages/shared/pkg/proxy/pool"
 	"github.com/e2b-dev/infra/packages/shared/pkg/proxy/template"
 )
@@ -60,13 +61,13 @@ func handler(p *pool.ProxyPool, getDestination func(r *http.Request) (*pool.Dest
 
 		var notFoundErr *SandboxNotFoundError
 		if errors.As(err, &notFoundErr) {
-			zap.L().Warn("sandbox not found", zap.String("host", r.Host))
+			zap.L().Warn("sandbox not found", zap.String("host", r.Host), logger.WithSandboxID(notFoundErr.SandboxId))
 
 			err := template.
 				NewSandboxNotFoundError(notFoundErr.SandboxId, r.Host).
 				HandleError(w, r)
 			if err != nil {
-				zap.L().Error("failed to handle sandbox not found error", zap.Error(err))
+				zap.L().Error("failed to handle sandbox not found error", zap.Error(err), logger.WithSandboxID(notFoundErr.SandboxId))
 				http.Error(w, "Failed to handle sandbox not found error", http.StatusInternalServerError)
 
 				return