diff --git a/e2e/support/helpers/e2e-ad-hoc-question-helpers.js b/e2e/support/helpers/e2e-ad-hoc-question-helpers.js
index 6514ac948661db064c9214ade143ffacc2371982..884402bfd48d7df3625b6a4eb6eef4041343b743 100644
--- a/e2e/support/helpers/e2e-ad-hoc-question-helpers.js
+++ b/e2e/support/helpers/e2e-ad-hoc-question-helpers.js
@@ -13,7 +13,7 @@ export function adhocQuestionHash(question) {
     // without "locking" the display, the QB will run its picking logic and override the setting
     question = Object.assign({}, question, { displayIsLocked: true });
   }
-  return btoa(unescape(encodeURIComponent(JSON.stringify(question))));
+  return btoa(decodeURIComponent(encodeURIComponent(JSON.stringify(question))));
 }
 
 /**