diff --git a/question_answer.module b/question_answer.module
index 453b09c..8092a0c 100644
--- a/question_answer.module
+++ b/question_answer.module
@@ -216,6 +216,14 @@ function theme_question_answer_formatter_duration($element) {
           if ($selected['cid'] > 0) {
             $node->{$qtype[$node->type]['answer']}[0]['value'] = $selected['cid'];
             node_save($node);
+
+            // The Talk module (if enabled) change $node->comment value to disable comment in
+            // the node page after saving the node. We need to revert and save the node again.
+            if ((module_exists('talk') && talk_activated($node->type)) && isset($node->comment_original_value)) {
+              $node->comment = $node->comment_original_value;
+            }
+            node_save($node);
+
             drupal_set_message(t('Comment #!cid has automatically been selected as the best answer', array('!cid' => $selected['cid'])));
           }
         }