diff --git a/lib/risk_engine/calculator.dart b/lib/risk_engine/calculator.dart
index 29c00c5..e50563c 100644
--- a/lib/risk_engine/calculator.dart
+++ b/lib/risk_engine/calculator.dart
@@ -104,7 +104,9 @@ BehavioralInputs _setToOptimal(BehavioralInputs inputs, String behaviorKey) {
 bool _isOptimal(BehavioralInputs inputs, String behaviorKey) {
   switch (behaviorKey) {
     case 'smoking':
-      return inputs.smoking == SmokingStatus.never;
+      // Former smokers have already quit - no further action possible
+      return inputs.smoking == SmokingStatus.never ||
+          inputs.smoking == SmokingStatus.former;
     case 'alcohol':
       return inputs.alcohol == AlcoholLevel.none ||
           inputs.alcohol == AlcoholLevel.light;