diff --git a/includes/node.inc b/includes/node.inc
index 2f156da..5ff33a7 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -77,8 +77,21 @@ function notifications_node_user_access($node, $account) {
  */
 function notifications_node_autocomplete_title($string = '') {
   $matches = array();
+  
+  $types = array();
+  if (module_exists('notifications_content')) {
+    // If notifications content module is enable, take into account the per-content type subscription
+    $node_types = node_get_types('names');
+    
+    // For each of the content types, check if the "thread" subscription is enabled
+    foreach($node_types as $type => $name) {
+      if (notifications_content_type_enabled($type, 'thread')) {
+        $types[] = $type;
+      }
+    }
+  }
 
-  foreach (_notifications_node_references($string) as $id => $row) {
+  foreach (_notifications_node_references($string, 'containts', $types) as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
     $matches[$row['title'] ." [nid:$id]"] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
   }
@@ -112,7 +125,8 @@ function _notifications_node_references($string, $match = 'contains', $types = a
     'equals' => "= '%s'",
     'starts_with' => "LIKE '%s%%'",
   );
-  if ($types) {
+  
+  if (!empty($types)) {
     $where[] = 'n.type IN (' . db_placeholders($types, 'char') . ') ';
     $args = $types;
   }