diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index 80a6f6a..f770e06 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -1916,14 +1916,15 @@ function hook_field_storage_delete($entity_type, $entity, $fields) {
  *   array are field IDs.
  */
 function hook_field_storage_delete_revision($entity_type, $entity, $fields) {
-  if (isset($entity->getRevisionId())) {
+  $vid = $entity->getRevisionId();
+  if (isset($vid)) {
     foreach ($fields as $field_id) {
       $field = field_info_field_by_id($field_id);
       $revision_name = _field_sql_storage_revision_tablename($field);
       db_delete($revision_name)
         ->condition('entity_type', $entity_type)
         ->condition('entity_id', $entity->id())
-        ->condition('revision_id', $entity->getRevisionId())
+        ->condition('revision_id', $vid)
         ->execute();
     }
   }