diff --git a/data-viewer/srv/data-service.js b/data-viewer/srv/data-service.js
index d92870cd..e0a5c776 100644
--- a/data-viewer/srv/data-service.js
+++ b/data-viewer/srv/data-service.js
@@ -34,7 +34,8 @@ class DataService extends cds.ApplicationService { init(){
     query.SELECT.limit = req.query.SELECT.limit  // forward $skip / $top
 
     const dataSource = findDataSource(dataSourceName, entityName)
-    const res = await dataSource.run(query)
+    let res = await dataSource.run(query)
+    if (!Array.isArray(res))  res = [res] // singleton result
     return res.map((line) => {
       const record = Object.entries(line).map(([column, data]) => ({ column, data }))
       return {