diff --git a/common/biomesoplenty/handlers/FlipperMovementEventHandler.java b/common/biomesoplenty/handlers/FlipperMovementEventHandler.java
index 6feb11ed7..b44fc5f2c 100644
--- a/common/biomesoplenty/handlers/FlipperMovementEventHandler.java
+++ b/common/biomesoplenty/handlers/FlipperMovementEventHandler.java
@@ -36,7 +36,7 @@ public class FlipperMovementEventHandler
 			
 			InventoryPlayer inventory = player.inventory;
 
-			if (player.isInWater())
+			if (player.isInWater() && !player.capabilities.isFlying)
 			{
 				if (inventory.armorInventory[0] != null && inventory.armorInventory[0].itemID == Items.flippers.get().itemID)
 				{