diff --git a/config_track.module b/config_track.module
index 00e2f80..ea2ab6b 100644
--- a/config_track.module
+++ b/config_track.module
@@ -47,7 +47,8 @@ function config_track_entity_presave_last(EntityInterface $entity) {
       if (!isset($config_data['data']) && in_array($config_data['operation'], ['create', 'update']) && ($config_data['uuid'] === $entity->uuid())) {
         $config_data['name'] = $entity->getEntityType()->getConfigPrefix() . '.' . $entity->id();;
         $config_data['data'] = $entity->toArray();
-        $config_data['original_data'] = !$entity->isNew() ? $entity->original->toArray() : NULL;
+        $config_data['original_data'] = (!$entity->isNew() && !empty($entity->original))
+          ? $entity->original->toArray() : NULL;
         $config_data['collection'] = \Drupal::configFactory()
           ->getEditable($config_data['name'])
           ->getStorage()