diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java
index 4474f905..ad7a8768 100644
--- a/common/buildcraft/factory/render/RenderTank.java
+++ b/common/buildcraft/factory/render/RenderTank.java
@@ -30,11 +30,18 @@ public class RenderTank extends TileEntitySpecialRenderer {
 		TileTank tank = (TileTank) CoreProxy.proxy.getServerTile(tileentity);
 
 		FluidStack liquid = tank.tank.getFluid();
-		int color = tank.tank.colorRenderCache;
-		if (liquid == null || liquid.amount <= 0) {
+		if (liquid == null || liquid.getFluid() == null || liquid.amount <= 0) {
 			return;
 		}
 
+		// Workaround: The colorRenderCache from the server tile from getServerTile(...) does not get synced properly
+		int color;
+		if(tank.getWorldObj().isRemote) {
+			color = tank.tank.colorRenderCache;
+		} else {
+			color = liquid.getFluid().getColor(liquid);
+		}
+
 		int[] displayList = FluidRenderer.getFluidDisplayLists(liquid, tileentity.getWorldObj(), false);
 		if (displayList == null) {
 			return;