diff --git a/dynamic_entity_reference.install b/dynamic_entity_reference.install
index 7606599..0a4870b 100644
--- a/dynamic_entity_reference.install
+++ b/dynamic_entity_reference.install
@@ -66,7 +66,8 @@ function dynamic_entity_reference_update_8001() {
         $type_column = $table_mapping->getFieldColumnName($field_storage_definition, 'target_type');
         $schema->changeField($table, $type_column, $type_column, $type_spec);
         $revision_table = NULL;
-        if ($entity_type->isRevisionable() && ($revision_table = $table_mapping->getDedicatedRevisionTableName($field_storage_definition))) {
+        if ($entity_type->isRevisionable() && $field_storage_definition->isRevisionable()) {
+          $revision_table = $table_mapping->getDedicatedRevisionTableName($field_storage_definition);
           $schema->changeField($revision_table, $column, $column, $spec);
           $schema->changeField($revision_table, $type_column, $type_column, $type_spec);
         }
diff --git a/src/EventSubscriber/FieldStorageSubscriber.php b/src/EventSubscriber/FieldStorageSubscriber.php
index d828cbd..8717f17 100644
--- a/src/EventSubscriber/FieldStorageSubscriber.php
+++ b/src/EventSubscriber/FieldStorageSubscriber.php
@@ -139,8 +139,8 @@ class FieldStorageSubscriber implements EventSubscriberInterface {
           continue;
         }
         $tables[$table][] = $column;
-        if ($entity_type->isRevisionable() && ($table = $mapping->getDedicatedRevisionTableName($storage_definitions[$field_name]))) {
-          $tables[$table][] = $column;
+        if ($entity_type->isRevisionable() && ($storage_definitions[$field_name]->isRevisionable())) {
+          $tables[$mapping->getDedicatedRevisionTableName($storage_definitions[$field_name])][] = $column;
         }
       }
       $new = [];