diff --git nodecomment.module nodecomment.module
index ab92252..d409487 100644
--- nodecomment.module
+++ nodecomment.module
@@ -605,7 +605,11 @@ function nodecomment_nodeapi(&$node, $op, $arg = 0, $page = 0) {
       // Restore comment setting so that we don't disable commenting
       // accidentally.
       if (isset($node->node_comment)) {
-        $node->comment = $node->node_comment;
+        // We need to allow changing of comment setting during node form
+        // submission.
+        if (!isset($node->form_id) || $node->form_id != $node->type . '_node_form') {
+          $node->comment = $node->node_comment;
+        }
       }
       break;