diff --git a/storagepanel/all/usr/bin/storagepanel.sh b/storagepanel/all/usr/bin/storagepanel.sh
index d89173c..d1377fe 100755
--- a/storagepanel/all/usr/bin/storagepanel.sh
+++ b/storagepanel/all/usr/bin/storagepanel.sh
@@ -76,7 +76,10 @@ if [ -z "${HDD_BAY}" ]; then
     done
     IDX=$((IDX + 1))
   done
-  HDD_BAY=${HDD_BAY:-RACK_24_Bay}
+  if [ ${IDX} -gt 24 ]
+    HDD_BAY=RACK_24_Bay
+  fi
+  HDD_BAY=${HDD_BAY:-RACK_60_Bay}
 fi
 
 if [ -z "${SSD_BAY}" ]; then