diff --git a/src/Plugin/search_api/datasource/ContentEntity.php b/src/Plugin/search_api/datasource/ContentEntity.php
index 2d65b6f..bb8e4bd 100644
--- a/src/Plugin/search_api/datasource/ContentEntity.php
+++ b/src/Plugin/search_api/datasource/ContentEntity.php
@@ -330,7 +330,8 @@ class ContentEntity extends DatasourcePluginBase implements EntityDatasourceInte
     // Exclude properties with custom storage, since we can't extract them
     // currently, due to a shortcoming of Core's Typed Data API. See #2695527.
     foreach ($properties as $key => $property) {
-      if ($property->getFieldStorageDefinition()->hasCustomStorage()) {
+      // Ignore isComputed() as custom storage in hasCustomStorage() function.
+      if (!empty($property->getFieldStorageDefinition()->definition['custom_storage'])) {
         unset($properties[$key]);
       }
     }