An electrode assembly for a flow battery is disclosed comprising a porous electrode material, a frame surrounding the porous electrode material, at least a distributor tube embedded in the porous electrode material having an inlet for supplying electrolyte to the porous electrode material and at least another distributor tube embedded in the porous electrode material having an outlet for discharging electrolyte out of the porous material. The walls of the distributor tubes are preferably provided with holes or pores for allowing a uniform distribution of the electrolyte within the electrode material. The distributor tubes provide the required electrolyte flow path length within the electrode material to minimize shunt current flowing between the flow cells in the battery stack.