diff --git a/customcommands/assets/customcommands-editcmd.html b/customcommands/assets/customcommands-editcmd.html
index 4c09ef4970..3d764fff6d 100644
--- a/customcommands/assets/customcommands-editcmd.html
+++ b/customcommands/assets/customcommands-editcmd.html
@@ -28,7 +28,7 @@ <h2>Custom commands</h2>
                     class="nav-item {{if $dot.CurrentCommandGroup}}{{if eq $dot.CurrentCommandGroup.ID .ID}}active{{end}}{{end}}">
                     <a data-partial-load="true"
                         class="nav-link show {{if $dot.CurrentCommandGroup}}{{if eq $dot.CurrentCommandGroup.ID .ID}}active{{end}}{{end}}"
-                        href="/manage/{{$dot.ActiveGuild.ID}}/customcommands/groups/{{.ID}}">{{.Name}}</a>
+                        href="/manage/{{$dot.ActiveGuild.ID}}/customcommands/groups/{{.ID}}">{{.Name}}{{if .Disabled}} <code>Disabled</code>{{end}}</a>
                 </li>
                 {{end}}
                 <li class="nav-item">
diff --git a/customcommands/assets/customcommands.html b/customcommands/assets/customcommands.html
index ff4ac99b17..2060d81857 100644
--- a/customcommands/assets/customcommands.html
+++ b/customcommands/assets/customcommands.html
@@ -47,7 +47,7 @@ <h2>Custom commands</h2>
                     class="nav-item {{if $dot.CurrentCommandGroup}}{{if eq $dot.CurrentCommandGroup.ID .ID}}active{{end}}{{end}}">
                     <a data-partial-load="true"
                         class="nav-link show {{if $dot.CurrentCommandGroup}}{{if eq $dot.CurrentCommandGroup.ID .ID}}active{{end}}{{end}}"
-                        href="/manage/{{$dot.ActiveGuild.ID}}/customcommands/groups/{{.ID}}">{{.Name}}</a>
+                        href="/manage/{{$dot.ActiveGuild.ID}}/customcommands/groups/{{.ID}}">{{.Name}}{{if .Disabled}} <code>Disabled</code>{{end}}</a>
                 </li>
                 {{end}}
                 <li class="nav-item">
@@ -106,6 +106,10 @@ <h2>Custom commands</h2>
                                         {{textChannelOptionsMulti .ActiveGuild.Channels .CurrentCommandGroup.IgnoreChannels }}
                                     </select>
                                 </div>
+                                <div class="form-group">
+                                    <label>Group disabled</label><br>
+                                    {{checkbox "disabled" "disabled" "Enables or Disables the group" .CurrentCommandGroup.Disabled}}
+                                </div>
                                 <div class="form-group">
                                     <button type="submit"
                                         title="Group #{{.CurrentCommandGroup.ID}} - {{.CurrentCommandGroup.Name}} &#013;Deleted group's commands become ungrouped."
diff --git a/customcommands/bot.go b/customcommands/bot.go
index da6f65816c..1e53ee9f49 100644
--- a/customcommands/bot.go
+++ b/customcommands/bot.go
@@ -395,10 +395,14 @@ func StringCommands(ccs []*models.CustomCommand, gMap map[int64]string) string {
 
 func handleDelayedRunCC(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) {
 	dataCast := data.(*DelayedRunCCData)
-	cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, dataCast.CmdID)).OneG(context.Background())
+	cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, dataCast.CmdID), qm.Load("Group")).OneG(context.Background())
 	if err != nil {
 		return false, errors.WrapIf(err, "find_command")
 	}
+	
+	if cmd.R.Group != nil && cmd.R.Group.Disabled {
+		return false, errors.New("custom command group is disabled")
+	}
 
 	if cmd.Disabled {
 		return false, errors.New("custom command is disabled")
@@ -465,11 +469,15 @@ func handleDelayedRunCC(evt *schEventsModels.ScheduledEvent, data interface{}) (
 }
 
 func handleNextRunScheduledEVent(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) {
-	cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, (data.(*NextRunScheduledEvent)).CmdID)).OneG(context.Background())
+	cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, (data.(*NextRunScheduledEvent)).CmdID), qm.Load("Group")).OneG(context.Background())
 	if err != nil {
 		return false, errors.WrapIf(err, "find_command")
 	}
 
+	if cmd.R.Group != nil && cmd.R.Group.Disabled {
+		return false, errors.New("custom command group is disabled")
+	}
+
 	if cmd.Disabled {
 		return false, errors.New("custom command is disabled")
 	}
@@ -841,7 +849,7 @@ func findMessageTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelSta
 
 	var matched []*TriggeredCC
 	for _, cmd := range cmds {
-		if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || !CmdRunsForUser(cmd, ms) {
+		if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || !CmdRunsForUser(cmd, ms) || cmd.R.Group != nil && cmd.R.Group.Disabled {
 			continue
 		}
 
@@ -877,7 +885,7 @@ func findReactionTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelSt
 
 	var matched []*TriggeredCC
 	for _, cmd := range cmds {
-		if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) {
+		if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || cmd.R.Group != nil && cmd.R.Group.Disabled {
 			continue
 		}
 
@@ -935,7 +943,7 @@ func findComponentOrModalTriggerCustomCommands(ctx context.Context, cs *dstate.C
 
 	var matched []*TriggeredCC
 	for _, cmd := range cmds {
-		if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) {
+		if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || cmd.R.Group != nil && cmd.R.Group.Disabled {
 			continue
 		}
 
diff --git a/customcommands/models/custom_command_groups.go b/customcommands/models/custom_command_groups.go
index 4ce83c29dc..e4b219ed6c 100644
--- a/customcommands/models/custom_command_groups.go
+++ b/customcommands/models/custom_command_groups.go
@@ -31,6 +31,7 @@ type CustomCommandGroup struct {
 	IgnoreChannels    types.Int64Array `boil:"ignore_channels" json:"ignore_channels,omitempty" toml:"ignore_channels" yaml:"ignore_channels,omitempty"`
 	WhitelistRoles    types.Int64Array `boil:"whitelist_roles" json:"whitelist_roles,omitempty" toml:"whitelist_roles" yaml:"whitelist_roles,omitempty"`
 	WhitelistChannels types.Int64Array `boil:"whitelist_channels" json:"whitelist_channels,omitempty" toml:"whitelist_channels" yaml:"whitelist_channels,omitempty"`
+	Disabled          bool             `boil:"disabled" json:"disabled" toml:"disabled" yaml:"disabled"`
 
 	R *customCommandGroupR `boil:"-" json:"-" toml:"-" yaml:"-"`
 	L customCommandGroupL  `boil:"-" json:"-" toml:"-" yaml:"-"`
@@ -44,6 +45,7 @@ var CustomCommandGroupColumns = struct {
 	IgnoreChannels    string
 	WhitelistRoles    string
 	WhitelistChannels string
+	Disabled          string
 }{
 	ID:                "id",
 	GuildID:           "guild_id",
@@ -52,6 +54,7 @@ var CustomCommandGroupColumns = struct {
 	IgnoreChannels:    "ignore_channels",
 	WhitelistRoles:    "whitelist_roles",
 	WhitelistChannels: "whitelist_channels",
+	Disabled:          "disabled",
 }
 
 var CustomCommandGroupTableColumns = struct {
@@ -62,6 +65,7 @@ var CustomCommandGroupTableColumns = struct {
 	IgnoreChannels    string
 	WhitelistRoles    string
 	WhitelistChannels string
+	Disabled          string
 }{
 	ID:                "custom_command_groups.id",
 	GuildID:           "custom_command_groups.guild_id",
@@ -70,6 +74,7 @@ var CustomCommandGroupTableColumns = struct {
 	IgnoreChannels:    "custom_command_groups.ignore_channels",
 	WhitelistRoles:    "custom_command_groups.whitelist_roles",
 	WhitelistChannels: "custom_command_groups.whitelist_channels",
+	Disabled:          "custom_command_groups.disabled",
 }
 
 // Generated where
@@ -148,6 +153,15 @@ func (w whereHelpertypes_Int64Array) GTE(x types.Int64Array) qm.QueryMod {
 func (w whereHelpertypes_Int64Array) IsNull() qm.QueryMod    { return qmhelper.WhereIsNull(w.field) }
 func (w whereHelpertypes_Int64Array) IsNotNull() qm.QueryMod { return qmhelper.WhereIsNotNull(w.field) }
 
+type whereHelperbool struct{ field string }
+
+func (w whereHelperbool) EQ(x bool) qm.QueryMod  { return qmhelper.Where(w.field, qmhelper.EQ, x) }
+func (w whereHelperbool) NEQ(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) }
+func (w whereHelperbool) LT(x bool) qm.QueryMod  { return qmhelper.Where(w.field, qmhelper.LT, x) }
+func (w whereHelperbool) LTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) }
+func (w whereHelperbool) GT(x bool) qm.QueryMod  { return qmhelper.Where(w.field, qmhelper.GT, x) }
+func (w whereHelperbool) GTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) }
+
 var CustomCommandGroupWhere = struct {
 	ID                whereHelperint64
 	GuildID           whereHelperint64
@@ -156,6 +170,7 @@ var CustomCommandGroupWhere = struct {
 	IgnoreChannels    whereHelpertypes_Int64Array
 	WhitelistRoles    whereHelpertypes_Int64Array
 	WhitelistChannels whereHelpertypes_Int64Array
+	Disabled          whereHelperbool
 }{
 	ID:                whereHelperint64{field: "\"custom_command_groups\".\"id\""},
 	GuildID:           whereHelperint64{field: "\"custom_command_groups\".\"guild_id\""},
@@ -164,6 +179,7 @@ var CustomCommandGroupWhere = struct {
 	IgnoreChannels:    whereHelpertypes_Int64Array{field: "\"custom_command_groups\".\"ignore_channels\""},
 	WhitelistRoles:    whereHelpertypes_Int64Array{field: "\"custom_command_groups\".\"whitelist_roles\""},
 	WhitelistChannels: whereHelpertypes_Int64Array{field: "\"custom_command_groups\".\"whitelist_channels\""},
+	Disabled:          whereHelperbool{field: "\"custom_command_groups\".\"disabled\""},
 }
 
 // CustomCommandGroupRels is where relationship names are stored.
@@ -194,9 +210,9 @@ func (r *customCommandGroupR) GetGroupCustomCommands() CustomCommandSlice {
 type customCommandGroupL struct{}
 
 var (
-	customCommandGroupAllColumns            = []string{"id", "guild_id", "name", "ignore_roles", "ignore_channels", "whitelist_roles", "whitelist_channels"}
+	customCommandGroupAllColumns            = []string{"id", "guild_id", "name", "ignore_roles", "ignore_channels", "whitelist_roles", "whitelist_channels", "disabled"}
 	customCommandGroupColumnsWithoutDefault = []string{"guild_id", "name"}
-	customCommandGroupColumnsWithDefault    = []string{"id", "ignore_roles", "ignore_channels", "whitelist_roles", "whitelist_channels"}
+	customCommandGroupColumnsWithDefault    = []string{"id", "ignore_roles", "ignore_channels", "whitelist_roles", "whitelist_channels", "disabled"}
 	customCommandGroupPrimaryKeyColumns     = []string{"id"}
 	customCommandGroupGeneratedColumns      = []string{}
 )
diff --git a/customcommands/models/custom_commands.go b/customcommands/models/custom_commands.go
index e446f54e71..9b7ceb55c3 100644
--- a/customcommands/models/custom_commands.go
+++ b/customcommands/models/custom_commands.go
@@ -49,10 +49,10 @@ type CustomCommand struct {
 	ShowErrors                bool              `boil:"show_errors" json:"show_errors" toml:"show_errors" yaml:"show_errors"`
 	Disabled                  bool              `boil:"disabled" json:"disabled" toml:"disabled" yaml:"disabled"`
 	TriggerOnEdit             bool              `boil:"trigger_on_edit" json:"trigger_on_edit" toml:"trigger_on_edit" yaml:"trigger_on_edit"`
-	Name                      null.String       `boil:"name" json:"name,omitempty" toml:"name" yaml:"name,omitempty"`
-	Public                    bool              `boil:"public" json:"public" toml:"public" yaml:"public"`
 	PublicID                  string            `boil:"public_id" json:"public_id" toml:"public_id" yaml:"public_id"`
 	ImportCount               int               `boil:"import_count" json:"import_count" toml:"import_count" yaml:"import_count"`
+	Name                      null.String       `boil:"name" json:"name,omitempty" toml:"name" yaml:"name,omitempty"`
+	Public                    bool              `boil:"public" json:"public" toml:"public" yaml:"public"`
 
 	R *customCommandR `boil:"-" json:"-" toml:"-" yaml:"-"`
 	L customCommandL  `boil:"-" json:"-" toml:"-" yaml:"-"`
@@ -83,10 +83,10 @@ var CustomCommandColumns = struct {
 	ShowErrors                string
 	Disabled                  string
 	TriggerOnEdit             string
-	Name                      string
-	Public                    string
 	PublicID                  string
 	ImportCount               string
+	Name                      string
+	Public                    string
 }{
 	LocalID:                   "local_id",
 	GuildID:                   "guild_id",
@@ -112,10 +112,70 @@ var CustomCommandColumns = struct {
 	ShowErrors:                "show_errors",
 	Disabled:                  "disabled",
 	TriggerOnEdit:             "trigger_on_edit",
-	Name:                      "name",
-	Public:                    "public",
 	PublicID:                  "public_id",
 	ImportCount:               "import_count",
+	Name:                      "name",
+	Public:                    "public",
+}
+
+var CustomCommandTableColumns = struct {
+	LocalID                   string
+	GuildID                   string
+	GroupID                   string
+	TriggerType               string
+	TextTrigger               string
+	TextTriggerCaseSensitive  string
+	TimeTriggerInterval       string
+	TimeTriggerExcludingDays  string
+	TimeTriggerExcludingHours string
+	LastRun                   string
+	NextRun                   string
+	Responses                 string
+	Channels                  string
+	ChannelsWhitelistMode     string
+	Roles                     string
+	RolesWhitelistMode        string
+	ContextChannel            string
+	ReactionTriggerMode       string
+	LastError                 string
+	LastErrorTime             string
+	RunCount                  string
+	ShowErrors                string
+	Disabled                  string
+	TriggerOnEdit             string
+	PublicID                  string
+	ImportCount               string
+	Name                      string
+	Public                    string
+}{
+	LocalID:                   "custom_commands.local_id",
+	GuildID:                   "custom_commands.guild_id",
+	GroupID:                   "custom_commands.group_id",
+	TriggerType:               "custom_commands.trigger_type",
+	TextTrigger:               "custom_commands.text_trigger",
+	TextTriggerCaseSensitive:  "custom_commands.text_trigger_case_sensitive",
+	TimeTriggerInterval:       "custom_commands.time_trigger_interval",
+	TimeTriggerExcludingDays:  "custom_commands.time_trigger_excluding_days",
+	TimeTriggerExcludingHours: "custom_commands.time_trigger_excluding_hours",
+	LastRun:                   "custom_commands.last_run",
+	NextRun:                   "custom_commands.next_run",
+	Responses:                 "custom_commands.responses",
+	Channels:                  "custom_commands.channels",
+	ChannelsWhitelistMode:     "custom_commands.channels_whitelist_mode",
+	Roles:                     "custom_commands.roles",
+	RolesWhitelistMode:        "custom_commands.roles_whitelist_mode",
+	ContextChannel:            "custom_commands.context_channel",
+	ReactionTriggerMode:       "custom_commands.reaction_trigger_mode",
+	LastError:                 "custom_commands.last_error",
+	LastErrorTime:             "custom_commands.last_error_time",
+	RunCount:                  "custom_commands.run_count",
+	ShowErrors:                "custom_commands.show_errors",
+	Disabled:                  "custom_commands.disabled",
+	TriggerOnEdit:             "custom_commands.trigger_on_edit",
+	PublicID:                  "custom_commands.public_id",
+	ImportCount:               "custom_commands.import_count",
+	Name:                      "custom_commands.name",
+	Public:                    "custom_commands.public",
 }
 
 // Generated where
@@ -181,15 +241,6 @@ func (w whereHelperint) NIN(slice []int) qm.QueryMod {
 	return qm.WhereNotIn(fmt.Sprintf("%s NOT IN ?", w.field), values...)
 }
 
-type whereHelperbool struct{ field string }
-
-func (w whereHelperbool) EQ(x bool) qm.QueryMod  { return qmhelper.Where(w.field, qmhelper.EQ, x) }
-func (w whereHelperbool) NEQ(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) }
-func (w whereHelperbool) LT(x bool) qm.QueryMod  { return qmhelper.Where(w.field, qmhelper.LT, x) }
-func (w whereHelperbool) LTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) }
-func (w whereHelperbool) GT(x bool) qm.QueryMod  { return qmhelper.Where(w.field, qmhelper.GT, x) }
-func (w whereHelperbool) GTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) }
-
 type whereHelpernull_Time struct{ field string }
 
 func (w whereHelpernull_Time) EQ(x null.Time) qm.QueryMod {
@@ -333,10 +384,10 @@ var CustomCommandWhere = struct {
 	ShowErrors                whereHelperbool
 	Disabled                  whereHelperbool
 	TriggerOnEdit             whereHelperbool
-	Name                      whereHelpernull_String
-	Public                    whereHelperbool
 	PublicID                  whereHelperstring
 	ImportCount               whereHelperint
+	Name                      whereHelpernull_String
+	Public                    whereHelperbool
 }{
 	LocalID:                   whereHelperint64{field: "\"custom_commands\".\"local_id\""},
 	GuildID:                   whereHelperint64{field: "\"custom_commands\".\"guild_id\""},
@@ -362,10 +413,10 @@ var CustomCommandWhere = struct {
 	ShowErrors:                whereHelperbool{field: "\"custom_commands\".\"show_errors\""},
 	Disabled:                  whereHelperbool{field: "\"custom_commands\".\"disabled\""},
 	TriggerOnEdit:             whereHelperbool{field: "\"custom_commands\".\"trigger_on_edit\""},
-	Name:                      whereHelpernull_String{field: "\"custom_commands\".\"name\""},
-	Public:                    whereHelperbool{field: "\"custom_commands\".\"public\""},
 	PublicID:                  whereHelperstring{field: "\"custom_commands\".\"public_id\""},
 	ImportCount:               whereHelperint{field: "\"custom_commands\".\"import_count\""},
+	Name:                      whereHelpernull_String{field: "\"custom_commands\".\"name\""},
+	Public:                    whereHelperbool{field: "\"custom_commands\".\"public\""},
 }
 
 // CustomCommandRels is where relationship names are stored.
@@ -396,9 +447,9 @@ func (r *customCommandR) GetGroup() *CustomCommandGroup {
 type customCommandL struct{}
 
 var (
-	customCommandAllColumns            = []string{"local_id", "guild_id", "group_id", "trigger_type", "text_trigger", "text_trigger_case_sensitive", "time_trigger_interval", "time_trigger_excluding_days", "time_trigger_excluding_hours", "last_run", "next_run", "responses", "channels", "channels_whitelist_mode", "roles", "roles_whitelist_mode", "context_channel", "reaction_trigger_mode", "last_error", "last_error_time", "run_count", "show_errors", "disabled", "trigger_on_edit", "name", "public", "public_id", "import_count"}
+	customCommandAllColumns            = []string{"local_id", "guild_id", "group_id", "trigger_type", "text_trigger", "text_trigger_case_sensitive", "time_trigger_interval", "time_trigger_excluding_days", "time_trigger_excluding_hours", "last_run", "next_run", "responses", "channels", "channels_whitelist_mode", "roles", "roles_whitelist_mode", "context_channel", "reaction_trigger_mode", "last_error", "last_error_time", "run_count", "show_errors", "disabled", "trigger_on_edit", "public_id", "import_count", "name", "public"}
 	customCommandColumnsWithoutDefault = []string{"local_id", "guild_id", "trigger_type", "text_trigger", "text_trigger_case_sensitive", "time_trigger_interval", "time_trigger_excluding_days", "time_trigger_excluding_hours", "responses", "channels_whitelist_mode", "roles_whitelist_mode"}
-	customCommandColumnsWithDefault    = []string{"group_id", "last_run", "next_run", "channels", "roles", "context_channel", "reaction_trigger_mode", "last_error", "last_error_time", "run_count", "show_errors", "disabled", "trigger_on_edit", "name", "public", "public_id", "import_count"}
+	customCommandColumnsWithDefault    = []string{"group_id", "last_run", "next_run", "channels", "roles", "context_channel", "reaction_trigger_mode", "last_error", "last_error_time", "run_count", "show_errors", "disabled", "trigger_on_edit", "public_id", "import_count", "name", "public"}
 	customCommandPrimaryKeyColumns     = []string{"guild_id", "local_id"}
 	customCommandGeneratedColumns      = []string{}
 )
diff --git a/customcommands/schema.go b/customcommands/schema.go
index ab5ff8cfa8..b095082773 100644
--- a/customcommands/schema.go
+++ b/customcommands/schema.go
@@ -92,4 +92,6 @@ CREATE INDEX IF NOT EXISTS templates_user_database_expires_idx ON templates_user
 ALTER TABLE custom_commands ADD COLUMN IF NOT EXISTS name TEXT;
 `, `
 ALTER TABLE custom_commands ADD COLUMN IF NOT EXISTS public BOOLEAN NOT NULL DEFAULT false;
+`, `
+ALTER TABLE custom_command_groups ADD COLUMN IF NOT EXISTS disabled BOOLEAN NOT NULL DEFAULT false;
 `}
diff --git a/customcommands/tmplextensions.go b/customcommands/tmplextensions.go
index 1d167b9886..545889e41b 100644
--- a/customcommands/tmplextensions.go
+++ b/customcommands/tmplextensions.go
@@ -180,11 +180,15 @@ func tmplRunCC(ctx *templates.Context) interface{} {
 			return "", templates.ErrTooManyCalls
 		}
 
-		cmd, err := models.FindCustomCommandG(context.Background(), ctx.GS.ID, int64(ccID))
+		cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", ctx.GS.ID, ccID), qm.Load("Group")).OneG(context.Background())
 		if err != nil {
 			return "", errors.New("Couldn't find custom command")
 		}
 
+		if cmd.R.Group != nil && cmd.R.Group.Disabled {
+			return "", errors.New("custom command group is disabled")
+		}
+
 		if cmd.Disabled {
 			return "", errors.New("custom command is disabled")
 		}
@@ -275,11 +279,15 @@ func tmplScheduleUniqueCC(ctx *templates.Context) interface{} {
 			return "", templates.ErrTooManyCalls
 		}
 
-		cmd, err := models.FindCustomCommandG(context.Background(), ctx.GS.ID, int64(ccID))
+		cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", ctx.GS.ID, ccID), qm.Load("Group")).OneG(context.Background())
 		if err != nil {
 			return "", errors.New("Couldn't find custom command")
 		}
 
+		if cmd.R.Group != nil && cmd.R.Group.Disabled {
+			return "", errors.New("custom command group is disabled")
+		}
+
 		if cmd.Disabled {
 			return "", errors.New("custom command is disabled")
 		}
diff --git a/customcommands/web.go b/customcommands/web.go
index 82a701cf29..cb2709878c 100644
--- a/customcommands/web.go
+++ b/customcommands/web.go
@@ -56,6 +56,7 @@ type GroupForm struct {
 
 	WhitelistRoles []int64 `valid:"role,true"`
 	BlacklistRoles []int64 `valid:"role,true"`
+	Disabled       bool
 }
 
 type SearchForm struct {
@@ -643,11 +644,16 @@ func handleRunCommandNow(w http.ResponseWriter, r *http.Request) (web.TemplateDa
 	}
 
 	// only interval commands can be ran from the dashboard currently
-	cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ? AND trigger_type = 5", activeGuild.ID, cmdID)).OneG(context.Background())
+	cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ? AND trigger_type = 5", activeGuild.ID, cmdID), qm.Load("Group")).OneG(context.Background())
 	if err != nil {
 		return templateData, err
 	}
 
+	if cmd.R.Group != nil && cmd.R.Group.Disabled {
+		templateData.AddAlerts(web.ErrorAlert("This command group is disabled, cannot run a command from disabled group."))
+		return templateData, nil
+	}
+
 	if cmd.Disabled {
 		templateData.AddAlerts(web.ErrorAlert("This command is disabled, cannot run a disabled command"))
 		return templateData, nil
@@ -741,6 +747,7 @@ func handleUpdateGroup(w http.ResponseWriter, r *http.Request) (web.TemplateData
 	model.WhitelistRoles = groupForm.WhitelistRoles
 	model.IgnoreRoles = groupForm.BlacklistRoles
 	model.Name = groupForm.Name
+	model.Disabled = groupForm.Disabled
 
 	_, err = model.UpdateG(ctx, boil.Infer())
 	if err == nil {