diff --git a/Runtime/MP1/CInventoryScreen.cpp b/Runtime/MP1/CInventoryScreen.cpp
index d6a82c63e..cdc4d1a36 100644
--- a/Runtime/MP1/CInventoryScreen.cpp
+++ b/Runtime/MP1/CInventoryScreen.cpp
@@ -63,7 +63,7 @@ CInventoryScreen::CInventoryScreen(const CStateManager& mgr, CGuiFrame& frame, c
   CPlayerState& playerState = *mgr.GetPlayerState();
   x19c_samusDoll = std::make_unique<CSamusDoll>(
       suitDgrp, ballDgrp,
-      CPlayerState::EPlayerSuit(int(playerState.GetCurrentSuit()) + playerState.IsFusionEnabled() * 4),
+      CPlayerState::EPlayerSuit(int(playerState.GetCurrentSuitRaw()) + (playerState.IsFusionEnabled() * 4)),
       playerState.GetCurrentBeam(), playerState.HasPowerUp(CPlayerState::EItemType::SpiderBall),
       playerState.HasPowerUp(CPlayerState::EItemType::GrappleBeam));
 }
diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp
index 45c053cd3..408d0f2a2 100644
--- a/Runtime/World/CPlayer.cpp
+++ b/Runtime/World/CPlayer.cpp
@@ -466,7 +466,7 @@ void CPlayer::UpdateMorphBallTransition(float dt, CStateManager& mgr) {
   switch (x2f8_morphBallState) {
   case EPlayerMorphBallState::Unmorphed:
   case EPlayerMorphBallState::Morphed: {
-    CPlayerState::EPlayerSuit suit = mgr.GetPlayerState()->GetCurrentSuit();
+    CPlayerState::EPlayerSuit suit = mgr.GetPlayerState()->GetCurrentSuitRaw();
     if (mgr.GetPlayerState()->IsFusionEnabled())
       suit = CPlayerState::EPlayerSuit(int(suit) + 4);
     if (x7cc_transitionSuit != suit) {