diff --git a/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx b/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx
index fa5609301..560c47765 100644
--- a/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx
+++ b/apps/console/src/pages/organizations/states-of-applicability/tabs/StateOfApplicabilityControlsTab.tsx
@@ -294,66 +294,58 @@ export default function StateOfApplicabilityControlsTab({
                 </Td>
                 <Td>
                   <div className="flex justify-center">
-                    <Badge
-                      variant={
-                        control.regulatory
-                          ? "success"
-                          : "danger"
-                      }
-                      size="sm"
-                    >
-                      {control.regulatory
-                        ? __("Yes")
-                        : __("No")}
-                    </Badge>
+                    {control.applicability === false
+                      ? <span className="text-txt-tertiary">-</span>
+                      : (
+                          <Badge
+                            variant={control.regulatory ? "success" : "danger"}
+                            size="sm"
+                          >
+                            {control.regulatory ? __("Yes") : __("No")}
+                          </Badge>
+                        )}
                   </div>
                 </Td>
                 <Td>
                   <div className="flex justify-center">
-                    <Badge
-                      variant={
-                        control.contractual
-                          ? "success"
-                          : "danger"
-                      }
-                      size="sm"
-                    >
-                      {control.contractual
-                        ? __("Yes")
-                        : __("No")}
-                    </Badge>
+                    {control.applicability === false
+                      ? <span className="text-txt-tertiary">-</span>
+                      : (
+                          <Badge
+                            variant={control.contractual ? "success" : "danger"}
+                            size="sm"
+                          >
+                            {control.contractual ? __("Yes") : __("No")}
+                          </Badge>
+                        )}
                   </div>
                 </Td>
                 <Td>
                   <div className="flex justify-center">
-                    <Badge
-                      variant={
-                        control.bestPractice
-                          ? "success"
-                          : "danger"
-                      }
-                      size="sm"
-                    >
-                      {control.bestPractice
-                        ? __("Yes")
-                        : __("No")}
-                    </Badge>
+                    {control.applicability === false
+                      ? <span className="text-txt-tertiary">-</span>
+                      : (
+                          <Badge
+                            variant={control.bestPractice ? "success" : "danger"}
+                            size="sm"
+                          >
+                            {control.bestPractice ? __("Yes") : __("No")}
+                          </Badge>
+                        )}
                   </div>
                 </Td>
                 <Td>
                   <div className="flex justify-center">
-                    <Badge
-                      variant={
-                        control.riskAssessment
-                          ? "success"
-                          : "danger"
-                      }
-                      size="sm"
-                    >
-                      {control.riskAssessment
-                        ? __("Yes")
-                        : __("No")}
-                    </Badge>
+                    {control.applicability === false
+                      ? <span className="text-txt-tertiary">-</span>
+                      : (
+                          <Badge
+                            variant={control.riskAssessment ? "success" : "danger"}
+                            size="sm"
+                          >
+                            {control.riskAssessment ? __("Yes") : __("No")}
+                          </Badge>
+                        )}
                   </div>
                 </Td>
                 {(canUpdate || canDelete) && (
diff --git a/pkg/docgen/generator.go b/pkg/docgen/generator.go
index 2a3de7d7f..815c95651 100644
--- a/pkg/docgen/generator.go
+++ b/pkg/docgen/generator.go
@@ -306,7 +306,7 @@ type (
 		Name           string
 		Applicability  *bool
 		Justification  *string
-		BestPractice   bool
+		BestPractice   *bool
 		Regulatory     *bool
 		Contractual    *bool
 		RiskAssessment *bool
diff --git a/pkg/docgen/soa_template.html b/pkg/docgen/soa_template.html
index c17e32ae2..9ed432344 100644
--- a/pkg/docgen/soa_template.html
+++ b/pkg/docgen/soa_template.html
@@ -333,19 +333,7 @@
                         </td>
                         <td>{{boolToYesNoDash .Regulatory}}</td>
                         <td>{{boolToYesNoDash .Contractual}}</td>
-                        <td>
-                            {{- if .Applicability}}
-                                {{- if and .Applicability .BestPractice}}
-                                Yes
-                                {{- else if .Applicability}}
-                                No
-                                {{- else}}
-                                -
-                                {{- end}}
-                            {{- else}}
-                            -
-                            {{- end}}
-                        </td>
+                        <td>{{boolToYesNoDash .BestPractice}}</td>
                         <td>{{boolToYesNoDash .RiskAssessment}}</td>
                     </tr>
                     {{- end}}
diff --git a/pkg/probo/state_of_applicability_service.go b/pkg/probo/state_of_applicability_service.go
index 0cfcbf6d0..39d2fac97 100644
--- a/pkg/probo/state_of_applicability_service.go
+++ b/pkg/probo/state_of_applicability_service.go
@@ -543,6 +543,7 @@ func (s StateOfApplicabilityService) ExportPDF(
 
 				var regulatory *bool
 				var contractual *bool
+				var bestPractice *bool
 				var riskAssessment *bool
 
 				if stmt.Applicability {
@@ -562,6 +563,8 @@ func (s StateOfApplicabilityService) ExportPDF(
 					if hasRisk {
 						riskAssessment = &trueVal
 					}
+
+					bestPractice = &control.BestPractice
 				}
 
 				applicability := stmt.Applicability
@@ -574,7 +577,7 @@ func (s StateOfApplicabilityService) ExportPDF(
 						Name:           control.Name,
 						Applicability:  &applicability,
 						Justification:  stmt.Justification,
-						BestPractice:   control.BestPractice,
+						BestPractice:   bestPractice,
 						Regulatory:     regulatory,
 						Contractual:    contractual,
 						RiskAssessment: riskAssessment,