diff --git a/automessage.go b/automessage.go
index c98cb5d..583c171 100644
--- a/automessage.go
+++ b/automessage.go
@@ -25,6 +25,7 @@ type autoMessage struct {
 	Message   string `json:"message,omitempty" yaml:"message,omitempty"`
 	UseAction bool   `json:"use_action,omitempty" yaml:"use_action,omitempty"`
 
+	Disable           bool    `json:"disable,omitempty" yaml:"disable,omitempty"`
 	DisableOnTemplate *string `json:"disable_on_template,omitempty" yaml:"disable_on_template,omitempty"`
 
 	Cron            string `json:"cron,omitempty" yaml:"cron,omitempty"`
@@ -83,6 +84,13 @@ func (a *autoMessage) CanSend() bool {
 		}
 	}
 
+	if a.Disable {
+		log.Trace("Auto-Message disabled by flag")
+		// Reset the timer for this execution not to spam every second
+		a.lastMessageSent = time.Now()
+		return false
+	}
+
 	if !a.allowExecuteDisableOnTemplate() {
 		log.Trace("Auto-Message disabled by template")
 		// Reset the timer for this execution not to spam every second
diff --git a/src/automessages.vue b/src/automessages.vue
index 1e0c3dc..132e061 100644
--- a/src/automessages.vue
+++ b/src/automessages.vue
@@ -45,6 +45,29 @@
             <code>{{ data.value }}</code>
           </template>
 
+          <template #cell(message)="data">
+            {{ data.value }}<br>
+            <b-badge
+              v-if="data.item.disable"
+              class="mt-1 mr-1"
+              variant="danger"
+            >
+              Disabled
+            </b-badge>
+            <b-badge
+              v-if="data.item.disable_on_template"
+              class="mt-1 mr-1"
+            >
+              Disable on Template
+            </b-badge>
+            <b-badge
+              v-if="data.item.only_on_live"
+              class="mt-1 mr-1"
+            >
+              Only during Stream
+            </b-badge>
+          </template>
+
           <template #head(actions)="">
             <b-button-group size="sm">
               <b-button
@@ -182,6 +205,15 @@
             </b-form-checkbox>
           </b-form-group>
 
+          <b-form-group>
+            <b-form-checkbox
+              v-model="models.autoMessage.disable"
+              switch
+            >
+              Disable Auto-Message entirely
+            </b-form-checkbox>
+          </b-form-group>
+
           <b-form-group
             label="Disable on Template"
             label-for="formAutoMessageDisableOnTemplate"