diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index f8c5fb8ea7..a4e4d1a6d2 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -822,14 +822,22 @@ static Widget _staffOptionsWidgets[] = {
             switch (staff->AssignedStaffType)
             {
                 case StaffType::Entertainer:
+                {
                     widgets[WIDX_CHECKBOX_1].type = WindowWidgetType::Empty;
                     widgets[WIDX_CHECKBOX_2].type = WindowWidgetType::Empty;
                     widgets[WIDX_CHECKBOX_3].type = WindowWidgetType::Empty;
                     widgets[WIDX_CHECKBOX_4].type = WindowWidgetType::Empty;
                     widgets[WIDX_COSTUME_BOX].type = WindowWidgetType::DropdownMenu;
                     widgets[WIDX_COSTUME_BTN].type = WindowWidgetType::Button;
-                    widgets[WIDX_COSTUME_BOX].text = StaffCostumeNames[EnumValue(staff->SpriteType) - 4];
+
+                    // TODO: retrieve string from object instead
+                    auto costumeType = EnumValue(staff->SpriteType) - EnumValue(PeepSpriteType::EntertainerPanda);
+                    if (costumeType >= 0)
+                        widgets[WIDX_COSTUME_BOX].text = StaffCostumeNames[costumeType];
+                    else
+                        widgets[WIDX_COSTUME_BOX].text = STR_UNKNOWN_OBJECT_TYPE;
                     break;
+                }
                 case StaffType::Handyman:
                     widgets[WIDX_CHECKBOX_1].type = WindowWidgetType::Checkbox;
                     widgets[WIDX_CHECKBOX_1].text = STR_STAFF_OPTION_SWEEP_FOOTPATHS;
diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp
index f8c1a9ea59..cc0d6a7d5a 100644
--- a/src/openrct2-ui/windows/StaffList.cpp
+++ b/src/openrct2-ui/windows/StaffList.cpp
@@ -729,7 +729,6 @@ static Widget _staffListWidgets[] = {
         {
             switch (type)
             {
-                default:
                 case PeepSpriteType::EntertainerPanda:
                     return SPR_STAFF_COSTUME_PANDA;
                 case PeepSpriteType::EntertainerTiger:
@@ -752,6 +751,9 @@ static Widget _staffListWidgets[] = {
                     return SPR_STAFF_COSTUME_SHERIFF;
                 case PeepSpriteType::EntertainerPirate:
                     return SPR_STAFF_COSTUME_PIRATE;
+                case PeepSpriteType::Normal:
+                default:
+                    return SPR_PEEP_SMALL_FACE_HAPPY;
             }
         }
     };