diff --git a/facebook_comments.module b/facebook_comments.module
index c29b245..678de75 100644
--- a/facebook_comments.module
+++ b/facebook_comments.module
@@ -159,7 +159,7 @@ function facebook_comments_field_extra_fields() {
 
   $default_types = variable_get('facebook_comments_types', array());
   foreach (node_type_get_types() as $type) {
-    if (isset($default_types[$type->type])) {
+    if (facebook_comments_is_enabled($type->type)) {
       $extra['node'][$type->type] = array(
         'display' => array(
           'facebook_comments' => array(
@@ -176,6 +176,18 @@ function facebook_comments_field_extra_fields() {
 }
 
 /**
+ * Helper function to determine if Facebook commenting is enabled.
+ */
+function facebook_comments_is_enabled($type) {
+  $default_types = variable_get('facebook_comments_types', array());
+  if (isset($default_types[$type]) && $default_types[$type] === $type) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+/**
  * Implements hook_form_alter().
  *
  * Add the Facebook commenting options for a node.
@@ -183,6 +195,8 @@ function facebook_comments_field_extra_fields() {
 function facebook_comments_form_node_form_alter(&$form, $form_state) {
   // Check if the user has permission to enabled and disable Facebook comments for this node
   if (!user_access('moderate facebook comments')) return;
+  // Check if the content type is enabled.
+  if (!facebook_comments_is_enabled($form['#node']->type)) return;
   // Load the default values
   $node = $form['#node'];
   // If this is a preview then get the values from the form, not the db
@@ -202,12 +216,12 @@ function facebook_comments_form_node_form_alter(&$form, $form_state) {
     if (!$defaults) {
       $defaulttypes = variable_get('facebook_comments_types', array());
       $defaults = new StdClass;
-      $defaults->enabled =  !empty($defaulttypes[$node->type]) ? 1 : 0;;
+      $defaults->enabled =  FALSE;
       $defaults->amount = 15;
     }
   }
   else {
-    // Init standard values
+    // Init standard values.
     $defaulttypes = variable_get('facebook_comments_types', array());
     $defaults = new StdClass;
     $defaults->enabled = !empty($defaulttypes[$node->type]) ? 1 : 0;
@@ -285,6 +299,8 @@ function facebook_comments_node_delete($node) {
  * Implements hook_node_view().
  */
 function facebook_comments_node_view($node, $view_mode, $langcode) {
+  // Check if the content type is enabled.
+  if (!facebook_comments_is_enabled($node->type)) return;
   // Check the view mode to display the comments or not
   $fc_viewmode = variable_get('facebook_comments_viewmode', 'full');
   if ($fc_viewmode != "both" && $view_mode != $fc_viewmode) return;