diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ccb3b3d4..685dfddda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to AET will be documented in this file.
 **List of changes that are finished but not yet released in any final version.**
 
 - [PR-522](https://github.com/Cognifide/aet/pull/522) Improve performance of generating /configs/list. ([#519](https://github.com/Cognifide/aet/issues/519))
+- [PR-554](https://github.com/Cognifide/aet/pull/554) Fix race condition under non-native bash environments ([#551](https://github.com/Cognifide/aet/issues/551))
 
 
 ## Version 3.3.0
diff --git a/client/client-scripts/aet.sh b/client/client-scripts/aet.sh
index 0607705aa..3eb49f457 100755
--- a/client/client-scripts/aet.sh
+++ b/client/client-scripts/aet.sh
@@ -169,8 +169,8 @@ while $process_status; do
     extract_code_and_body "$status_response"
 
     if [ $code -eq 200 ]; then
-        status=$(echo $body | jq -r ".status")
-        message=$(echo $body | jq -r ".message")
+        status=$(echo "$body" | jq -r ".status")
+        message=$(echo "$body" | jq -r ".message")
 
         case "$status" in
             "FINISHED")
@@ -197,4 +197,4 @@ while $process_status; do
         $body"
         exit 1
     fi
-done
\ No newline at end of file
+done