diff --git a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/dialogs/QnAMakerDialog.java b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/dialogs/QnAMakerDialog.java
index 959a39efa..9c5480071 100644
--- a/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/dialogs/QnAMakerDialog.java
+++ b/libraries/bot-ai-qna/src/main/java/com/microsoft/bot/ai/qna/dialogs/QnAMakerDialog.java
@@ -854,13 +854,9 @@ private CompletableFuture<DialogTurnResult> callGenerateAnswer(WaterfallStepCont
 
         // Calling QnAMaker to get response.
         return this.getQnAMakerClient(stepContext).thenApply(qnaMakerClient -> {
-            QueryResults response =
-                (QueryResults) stepContext.getState().get(String.format("turn.qnaresult%s", this.hashCode()));
-            if (response == null) {
-                response = qnaMakerClient
+            QueryResults response = qnaMakerClient
                     .getAnswersRaw(stepContext.getContext(), dialogOptions.getQnAMakerOptions(), null, null)
                     .join();
-            }
 
             // Resetting previous query.
             Integer previousQnAId = -1;
@@ -980,8 +976,11 @@ private CompletableFuture<DialogTurnResult> checkForMultiTurnPrompt(WaterfallSte
 
             if (answer.getContext() != null && answer.getContext().getPrompts().length > 0) {
                 Map<String, Integer> previousContextData =
-                    ObjectPath.getPathValue(stepContext.getActiveDialog().getState(), QNA_CONTEXT_DATA, Map.class);
-
+                    ObjectPath.getPathValue(
+                        stepContext.getActiveDialog().getState(),
+                        QNA_CONTEXT_DATA,
+                        Map.class,
+                        new HashMap<>());
                 for (QnAMakerPrompt prompt : answer.getContext().getPrompts()) {
                     previousContextData.put(prompt.getDisplayText(), prompt.getQnaId());
                 }