diff --git a/src/battle/jumpgate.c b/src/battle/jumpgate.c
index 706dd11..55ed412 100644
--- a/src/battle/jumpgate.c
+++ b/src/battle/jumpgate.c
@@ -47,7 +47,7 @@ Entity *spawnJumpgate(int side, long flags)
 	jumpgate->action = think;
 	jumpgate->draw = draw;
 	jumpgate->side = side;
-	jumpgate->flags = EF_NO_MT_BOX+EF_IMMORTAL+EF_AI_IGNORE+EF_NON_SOLID;
+	jumpgate->flags = EF_NO_MT_BOX+EF_IMMORTAL+EF_AI_IGNORE+EF_NON_SOLID+EF_NO_HEALTH_BAR;
 	if (flags != -1 && flags & EF_DISABLED)
 	{
 		jumpgate->flags |= EF_DISABLED;
diff --git a/src/battle/player.c b/src/battle/player.c
index f845d43..6a53f02 100644
--- a/src/battle/player.c
+++ b/src/battle/player.c
@@ -87,6 +87,8 @@ void initPlayer(void)
 	game.stats[STAT_EPIC_KILL_STREAK] = MAX(game.stats[STAT_EPIC_KILL_STREAK], battle.stats[STAT_EPIC_KILL_STREAK]);
 
 	battle.stats[STAT_EPIC_KILL_STREAK] = 0;
+	
+	player->flags |= EF_NO_HEALTH_BAR;
 }
 
 void doPlayer(void)
diff --git a/src/battle/waypoints.c b/src/battle/waypoints.c
index 74f1c4b..dfd8e14 100644
--- a/src/battle/waypoints.c
+++ b/src/battle/waypoints.c
@@ -44,9 +44,8 @@ Entity *spawnWaypoint(void)
 	waypoint->active = 0;
 	waypoint->health = waypoint->maxHealth = FPS;
 	waypoint->texture = getTexture("gfx/entities/waypoint.png");
-	waypoint->flags = EF_MISSION_TARGET;
+	waypoint->flags = EF_NO_MT_BOX+EF_MISSION_TARGET+EF_NO_HEALTH_BAR;
 	waypoint->action = think;
-	waypoint->flags |= EF_NO_MT_BOX;
 	
 	SDL_QueryTexture(waypoint->texture, NULL, NULL, &waypoint->w, &waypoint->h);
 	
diff --git a/src/defs.h b/src/defs.h
index 8478b76..38b1e39 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -104,6 +104,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EF_NO_PLAYER_TARGET		(2 << 18)
 #define EF_AI_IGNORE			(2 << 19)
 #define EF_NON_SOLID			(2 << 20)
+#define EF_NO_HEALTH_BAR		(2 << 21)
 
 #define AIF_NONE				0
 #define AIF_FOLLOWS_PLAYER		(2 << 0)