diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
index 249ea749c6..f65e22f01f 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
@@ -118,7 +118,7 @@ export const enrichDatasources = (
 
     const entities = Array.isArray(datasource.entities)
       ? datasource.entities
-      : Object.values(datasource.entities)
+      : Object.values(datasource.entities || {})
     const dsTables = entities.filter(
       table =>
         !searchTerm ||