diff --git a/redfish-core/lib/chassis.hpp b/redfish-core/lib/chassis.hpp
index 51effb6..e2461e9 100644
--- a/redfish-core/lib/chassis.hpp
+++ b/redfish-core/lib/chassis.hpp
@@ -525,6 +525,11 @@
         return;
     }
 
+    // Chassis Type is a required property in Redfish
+    // If there is an error or some enum we don't support just sit it to Rack
+    // Mount
+    asyncResp->res.jsonValue["ChassisType"] = chassis::ChassisType::RackMount;
+
     if (type != nullptr)
     {
         auto chassisType = translateChassisTypeToRedfish(*type);
@@ -533,11 +538,6 @@
             asyncResp->res.jsonValue["ChassisType"] = chassisType;
         }
     }
-    else
-    {
-        asyncResp->res.jsonValue["ChassisType"] =
-            chassis::ChassisType::RackMount;
-    }
 }
 
 inline void handleChassisGetSubTree(
diff --git a/test/redfish-core/lib/chassis_test.cpp b/test/redfish-core/lib/chassis_test.cpp
index c6186cf..c97b42c 100644
--- a/test/redfish-core/lib/chassis_test.cpp
+++ b/test/redfish-core/lib/chassis_test.cpp
@@ -132,7 +132,8 @@
         dbus::utility::DbusVariantType(
             "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.Unknown"));
     handleChassisProperties(response, properties);
-    ASSERT_FALSE(response->res.jsonValue.contains("ChassisType"));
+    // We fall back to RackMount
+    ASSERT_EQ("RackMount", response->res.jsonValue["ChassisType"]);
 }
 
 TEST(HandleChassisProperties, FailToGetProperty)