diff --git a/src/main/java/net/torocraft/torohud/gui/HealthBars.java b/src/main/java/net/torocraft/torohud/gui/HealthBars.java
index 669bc6a..b3dfbf0 100644
--- a/src/main/java/net/torocraft/torohud/gui/HealthBars.java
+++ b/src/main/java/net/torocraft/torohud/gui/HealthBars.java
@@ -33,6 +33,7 @@
 import net.torocraft.torohud.ToroHUD;
 import net.torocraft.torohud.conf.HealthBarGuiConf;
 import net.torocraft.torohud.conf.HealthBarsConf;
+import net.torocraft.torohud.conf.HealthBarsConf.Mode;
 import net.torocraft.torohud.display.AbstractEntityDisplay;
 import net.torocraft.torohud.util.EntityUtil;
 import org.apache.commons.lang3.ArrayUtils;
@@ -79,10 +80,13 @@ public static void onRenderWorldLast(RenderWorldLastEvent event) {
   }
 
   public static boolean barsAreCurrentlyDisabled() {
-    if (HealthBarsConf.showBarsAboveEntities.equals(HealthBarsConf.Mode.ALWAYS)) {
+    if (HealthBarsConf.showBarsAboveEntities.equals(Mode.ALWAYS)) {
       return false;
     }
-    if (HealthBarsConf.showBarsAboveEntities.equals(HealthBarsConf.Mode.WHEN_HOLDING_WEAPON)) {
+    if (HealthBarsConf.showBarsAboveEntities.equals(Mode.NONE)) {
+      return true;
+    }
+    if (HealthBarsConf.showBarsAboveEntities.equals(Mode.WHEN_HOLDING_WEAPON)) {
       return !holdingWeapon;
     }
     return false;