diff --git a/question_answer.module b/question_answer.module
index 453b09c..4daf60a 100644
--- a/question_answer.module
+++ b/question_answer.module
@@ -215,6 +215,13 @@ function theme_question_answer_formatter_duration($element) {
 
           if ($selected['cid'] > 0) {
             $node->{$qtype[$node->type]['answer']}[0]['value'] = $selected['cid'];
+
+            // The Talk module change $node->comment value to disable comment in
+            // the node page. We revert it before saving node.
+            if (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'])));
           }