diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
index cf7b6c032c..3e6556ac53 100644
--- a/.buildkite/hooks/post-command
+++ b/.buildkite/hooks/post-command
@@ -32,15 +32,17 @@ else
   fi
 
   if [[ -n $BUILDKITE && -f "results.json" ]]; then
-    # prepare result file
-    awk '/{ "type": .* }/' results.json > sanitized-results.json
+    # extract lines which start with '{'
+    awk '/{.*/' results.json > sanitized-results.json
 
     echo "~~~ Uploading test results to Buildkite Analytics"
     buildkite-test-collector < sanitized-results.json
 
-    # upload to datadog
-    cargo2junit > results.xml < sanitized-results.json
-    datadog-ci junit upload --service solana results.xml
+    echo "~~~ Uploading test results to Datadog"
+    cargo2junit > results.xml < sanitized-results.json || true
+    if [[ -f "results.xml" ]]; then
+      datadog-ci junit upload --service solana results.xml
+    fi
   fi
 
   point_tags="pipeline=$BUILDKITE_PIPELINE_SLUG,job=$CI_LABEL,pr=$PR,success=$SUCCESS"