diff --git a/CHANGELOG.md b/CHANGELOG.md
index 077a48da..37e90221 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-- [#256](https://github.com/os2display/display-admin-client/pull/257)
+- [#258](https://github.com/os2display/display-admin-client/pull/258)
+  - Fixed screen is vertical check.
+- [#257](https://github.com/os2display/display-admin-client/pull/257)
   - Update multiselect component
   - Change key in function from `id` to `@id`
 - [#256](https://github.com/os2display/display-admin-client/pull/256)
diff --git a/src/components/screen/screen-form.jsx b/src/components/screen/screen-form.jsx
index b0919154..a6e68491 100644
--- a/src/components/screen/screen-form.jsx
+++ b/src/components/screen/screen-form.jsx
@@ -142,7 +142,7 @@ function ScreenForm({
   };
 
   const isVertical = () => {
-    if (screen.orientation) {
+    if (screen?.orientation?.length > 0) {
       return screen.orientation[0].id === "vertical";
     }
     return false;