diff --git a/frontend/src/pages/devices.js b/frontend/src/pages/devices.js
index f39129d..519b8ec 100644
--- a/frontend/src/pages/devices.js
+++ b/frontend/src/pages/devices.js
@@ -33,7 +33,7 @@ const Page = () => {
.catch(error => console.error('Error:', error));
}, [auth.user]);
- return (devices &&
+ return (
<>
diff --git a/frontend/src/sections/overview/overview-latest-orders.js b/frontend/src/sections/overview/overview-latest-orders.js
index cb33731..996d99c 100644
--- a/frontend/src/sections/overview/overview-latest-orders.js
+++ b/frontend/src/sections/overview/overview-latest-orders.js
@@ -72,7 +72,7 @@ export const OverviewLatestOrders = (props) => {
- {orders.map((order) => {
+ {orders && orders.map((order) => {
return (