diff --git a/Jenkinsfile b/Jenkinsfile
index 60cd6fa0ba7..a6d617fa25a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -171,12 +171,13 @@ pipeline {
 def cleanDockerE2E() {
     script {
         sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
-        if (containerId) {
+        if (containerId?.trim()) {
             sh "docker rm ${containerId} || true"
         }
     }
 }
 
+
 def checkErrors(String containerId) {
     echo "Container ID: ${containerId}"
     def exitCode = sh(script: "docker inspect -f '{{.State.ExitCode}}' ${containerId}", returnStdout: true).trim()