diff -u b/paragraphs.install b/paragraphs.install
--- b/paragraphs.install
+++ b/paragraphs.install
@@ -316,24 +316,25 @@
         'binary' => FALSE,
         'not null' => FALSE,
       ];
+      // Create fields if they don't already exist.
       if (!$database->schema()->fieldExists('paragraphs_item_revision_field_data', $field_name)) {
         $database->schema()
-          ->addField('paragraphs_item_revision_field_data', $field_name,
-            $column_schema);
+          ->addField('paragraphs_item_revision_field_data', $field_name, $column_schema);
       }
     }
 
     // Get all paragraphs to update.
-    $paragraphs = $database->select('paragraphs_item_field_data', 'p')
-      ->countQuery()
+    $paragraphs = \Drupal::entityQuery('paragraph')
+      ->count()
       ->execute();
     $sandbox['total'] = $paragraphs;
     $sandbox['current'] = 0;
+  }
 
-    if (!$sandbox['total']) {
-      $sandbox['#finished'] = 1;
-      return t('No Paragraphs to be processed.');
-    }
+  // Do not continue if no paragraphs are found.
+  if (empty($sandbox['total'])) {
+    $sandbox['#finished'] = 1;
+    return t('No Paragraphs to be processed.');
   }
 
   $paragraphs_per_batch = 50;