diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c
index 0426fe63f9..03eb296b1d 100644
--- a/src/battle_dynamax.c
+++ b/src/battle_dynamax.c
@@ -113,7 +113,7 @@ bool32 CanDynamax(u16 battlerId)
 	#if B_FLAG_DYNAMAX_BATTLE != 0
 	if (!FlagGet(B_FLAG_DYNAMAX_BATTLE))
 	#endif
-		return FALSE;
+	//	return FALSE;
 
 	// Check if Player has a Dynamax Band.
     if ((GetBattlerPosition(battlerId) == B_POSITION_PLAYER_LEFT || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battlerId) == B_POSITION_PLAYER_RIGHT))
diff --git a/src/battle_util.c b/src/battle_util.c
index e829ce6dd5..402475f162 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -10917,6 +10917,9 @@ bool32 CanTargetBattler(u8 battlerAtk, u8 battlerDef, u16 move)
       && GetBattlerSide(battlerAtk) == GetBattlerSide(battlerDef)
       && gStatuses3[battlerAtk] & STATUS3_HEAL_BLOCK)
         return FALSE;   // Pokémon affected by Heal Block cannot target allies with Pollen Puff
+    if ((IsDynamaxed(battlerAtk) || gBattleStruct->dynamax.playerSelect)
+      && GetBattlerSide(battlerAtk) == GetBattlerSide(battlerDef))
+        return FALSE;
     return TRUE;
 }