diff --git a/app/client/.husky/check-staged-files.sh b/app/client/.husky/check-staged-files.sh
index a0c3b1eaec..1c149d4b84 100644
--- a/app/client/.husky/check-staged-files.sh
+++ b/app/client/.husky/check-staged-files.sh
@@ -6,7 +6,12 @@ is_client_change=$(git diff --cached --name-only | grep -c "app/client")
 if [ "$is_server_change" -ge 1 ]; then
   echo "Running Spotless check ..."
     pushd app/server > /dev/null
-    (mvn spotless:check 1> /dev/null && popd > /dev/null) || (echo "Spotless check failed, please run mvn spotless:apply" && exit 1)
+    if (mvn spotless:check 1> /dev/null && popd > /dev/null) then
+      popd
+    else
+      echo "Spotless check failed, please run mvn spotless:apply"
+      exit 1
+    fi
 else
     echo "Skipping server side check..."
 fi