diff --git a/cmd/fleetctl/fleetctl/generate_gitops.go b/cmd/fleetctl/fleetctl/generate_gitops.go
index 29d1e6fae7..77a828103f 100644
--- a/cmd/fleetctl/fleetctl/generate_gitops.go
+++ b/cmd/fleetctl/fleetctl/generate_gitops.go
@@ -926,7 +926,8 @@ func (cmd *GenerateGitopsCommand) generateControls(teamId *uint, teamName string
 			}
 			hasSetupSoftware := false
 			for _, software := range setupSoftware {
-				if software.SoftwarePackage.InstallDuringSetup != nil && *software.SoftwarePackage.InstallDuringSetup {
+				pkg := software.SoftwarePackage
+				if pkg != nil && pkg.InstallDuringSetup != nil && *pkg.InstallDuringSetup {
 					hasSetupSoftware = true
 					break
 				}
diff --git a/cmd/fleetctl/fleetctl/generate_gitops_test.go b/cmd/fleetctl/fleetctl/generate_gitops_test.go
index 6da119acce..f521941426 100644
--- a/cmd/fleetctl/fleetctl/generate_gitops_test.go
+++ b/cmd/fleetctl/fleetctl/generate_gitops_test.go
@@ -420,6 +420,11 @@ func (MockClient) GetSetupExperienceSoftware(teamID uint) ([]fleet.SoftwareTitle
 					Version:            "13.37",
 				},
 			},
+			{
+				ID:         2,
+				Name:       "My Other Software Package",
+				HashSHA256: ptr.String("software-package-hash"),
+			},
 		}, nil
 	}
 	if teamID == 0 || teamID == 3 || teamID == 4 || teamID == 5 {