diff --git a/src/middlewared/middlewared/plugins/enclosure_/enclosure_class.py b/src/middlewared/middlewared/plugins/enclosure_/enclosure_class.py
index 324df79aa6e0c..da45e0f7e56c9 100644
--- a/src/middlewared/middlewared/plugins/enclosure_/enclosure_class.py
+++ b/src/middlewared/middlewared/plugins/enclosure_/enclosure_class.py
@@ -660,7 +660,6 @@ def top_loaded(self):
         Returns: bool
         """
         return any((
-            self.is_r40,
             self.is_r50_series,
             self.is_60_bay_jbod,
             self.is_102_bay_jbod
@@ -674,7 +673,7 @@ def top_slots(self):
         Returns: int
         """
         if self.top_loaded:
-            if self.is_r40 or self.is_r50_series:
+            if self.is_r50_series:
                 return 48
             elif self.is_60_bay_jbod:
                 return 60
@@ -695,6 +694,7 @@ def front_loaded(self):
         return any((
             self.is_xseries,
             self.is_r30,
+            self.is_r40,
             self.is_12_bay_jbod,
             self.is_r20_series,
             self.is_hseries,