diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index d486d5f9..a2681d33 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -107,6 +107,14 @@ let AttributeSchema = createPropertySchema({
     type: Boolean,
     optional: true,
   },
+  hideWhenTotalZero: {
+    type: Boolean,
+    optional: true,
+  },
+  hideWhenValueZero: {
+    type: Boolean,
+    optional: true,
+  },
   // Automatically zero the adjustment on these conditions
   reset: {
     type: String,
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index e8122e32..a201c69c 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -365,6 +365,10 @@ const getProperties = function (creature, filter, options = {
   filter.removed = { $ne: true };
   filter.inactive = { $ne: true };
   filter.overridden = { $ne: true };
+  filter.$nor = [
+    { hideWhenTotalZero: true, total: 0 },
+    { hideWhenValueZero: true, value: 0 },
+  ];
 
   return CreatureProperties.find(filter, options);
 };
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
index 639beee0..db3b9c66 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
@@ -42,6 +42,10 @@ export default {
         removed: { $ne: true },
         inactive: { $ne: true },
         overridden: { $ne: true },
+        $nor: [
+          { hideWhenTotalZero: true, total: 0 },
+          { hideWhenValueZero: true, value: 0 },
+        ],
       };
       if (creature.settings.hideUnusedStats) {
         filter.hide = { $ne: true };
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index 42814d86..4dc36f07 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -151,26 +151,74 @@
           @change="change('tags', ...arguments)"
         />
         <div class="layout column align-center">
-          <smart-switch
-            v-if="model.attributeType !== 'hitDice'"
-            label="Allow decimal values"
-            class="no-flex"
-            :value="model.decimal"
-            :error-messages="errors.decimal"
-            @change="change('decimal', ...arguments)"
-          />
-          <smart-switch
-            label="Can be damaged into negative values"
-            :value="model.ignoreLowerLimit"
-            :error-messages="errors.ignoreLowerLimit"
-            @change="change('ignoreLowerLimit', ...arguments)"
-          />
-          <smart-switch
-            label="Can be incremented above total"
-            :value="model.ignoreUpperLimit"
-            :error-messages="errors.ignoreUpperLimit"
-            @change="change('ignoreUpperLimit', ...arguments)"
-          />
+          <v-row dense>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                v-if="model.attributeType !== 'hitDice'"
+                label="Allow decimal values"
+                class="mx-4"
+                :value="model.decimal"
+                :error-messages="errors.decimal"
+                @change="change('decimal', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Can be damaged into negative values"
+                class="mx-4"
+                :value="model.ignoreLowerLimit"
+                :error-messages="errors.ignoreLowerLimit"
+                @change="change('ignoreLowerLimit', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Can be incremented above total"
+                class="mx-4"
+                :value="model.ignoreUpperLimit"
+                :error-messages="errors.ignoreUpperLimit"
+                @change="change('ignoreUpperLimit', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Hide when total is zero"
+                class="mx-4"
+                :value="model.hideWhenTotalZero"
+                :error-messages="errors.hideWhenTotalZero"
+                @change="change('hideWhenTotalZero', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Hide when value is zero"
+                class="mx-4"
+                :value="model.hideWhenValueZero"
+                :error-messages="errors.hideWhenValueZero"
+                @change="change('hideWhenValueZero', ...arguments)"
+              />
+            </v-col>
+          </v-row>
           <div
             class="layout justify-center"
             style="align-self: stretch;"