diff --git a/ciao-controller/internal/datastore/sqlite3db.go b/ciao-controller/internal/datastore/sqlite3db.go
index e6fdc3dab..c330e3768 100644
--- a/ciao-controller/internal/datastore/sqlite3db.go
+++ b/ciao-controller/internal/datastore/sqlite3db.go
@@ -1128,6 +1128,11 @@ func (ds *sqliteDB) getTenantsNoCache() ([]*tenant, error) {
 			return nil, err
 		}
 
+		t.devices, err = ds.getTenantDevices(t.ID)
+		if err != nil {
+			return nil, err
+		}
+
 		tenants = append(tenants, t)
 	}
 	if err = rows.Err(); err != nil {