diff --git a/.github/workflows/build_bromite.yaml b/.github/workflows/build_bromite.yaml
index d9819e9..bfc3d4e 100644
--- a/.github/workflows/build_bromite.yaml
+++ b/.github/workflows/build_bromite.yaml
@@ -366,7 +366,7 @@ jobs:
           $WORKSPACE/mtool/chromium/mtime.sh --backup
           mv .mtool out/bromite/
           cp -arp out/bromite $ARTIFACS_DIR/out
-          echo "::endgroup::"
+          echo "::endgroup::
           
       - name: Stop goma
         shell: bash
@@ -375,7 +375,7 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- stop goma"
-          $WORKSPACE/goma/goma_ctl.py ensure_stop
-          find /tmp/ -maxdepth 1 -name "gomacc*" -print0 | xargs -0 rm
-          rm -rf /tmp/goma_lg/
+          [[ "$USEGOMA" = "true" ]] && $WORKSPACE/goma/goma_ctl.py ensure_stop || true
+          [[ "$USEGOMA" = "true" ]] && find /tmp/ -maxdepth 1 -name "gomacc*" -print0 | xargs -0 rm || true
+          [[ "$USEGOMA" = "true" ]] && rm -rf /tmp/goma_lg/ || true
           echo "::endgroup::"