diff --git a/metatags_quick.drush.inc b/metatags_quick.drush.inc
index e01f26b..c950081 100644
--- a/metatags_quick.drush.inc
+++ b/metatags_quick.drush.inc
@@ -87,8 +87,9 @@ function drush_metatags_quick_migrate_fields($field_names) {
   $_SESSION['nodewords_upgrade_processed'] = 0;
   drupal_set_message(t('Converting metatags for @num nodes', array('@num' => $num_operations)));
   $operations = array();
-  $nid_result = db_select('node', 'n')
-    ->fields('n', array('nid'))
+  $nid_result = db_select('nodewords', 'nw');
+  $nid_result->join('node', 'n', 'nw.id=n.nid');
+  $nid_result->fields('n', array('nid'))
     ->execute();
   $nids = array();
   foreach ($nid_result as $node) {
diff --git a/metatags_quick_import.admin.inc b/metatags_quick_import.admin.inc
index 1f4d258..1e919df 100644
--- a/metatags_quick_import.admin.inc
+++ b/metatags_quick_import.admin.inc
@@ -100,8 +100,9 @@ function metatags_quick_upgrade_batch($batch_size, $fields_to_import) {
   $_SESSION['nodewords_upgrade_processed'] = 0;
   drupal_set_message(t('Converting metatags for @num nodes', array('@num' => $num_operations)));
   $operations = array();
-  $nid_result = db_select('node', 'n')
-    ->fields('n', array('nid'))
+  $nid_result = db_select('nodewords', 'nw');
+  $nid_result->join('node', 'n', 'nw.id=n.nid');
+  $nid_result->fields('n', array('nid'))
     ->execute();
   $nids = array();
   foreach ($nid_result as $node) {