diff --git a/src/components/CelebrationAnimation.tsx b/src/components/CelebrationAnimation.tsx
index a918165..bc471f7 100644
--- a/src/components/CelebrationAnimation.tsx
+++ b/src/components/CelebrationAnimation.tsx
@@ -104,6 +104,10 @@ export function CelebrationAnimation({
               </p>
               <h2 className="text-2xl font-bold text-white mb-1">{badge.name}</h2>
               <p className="text-white/70 text-sm">{badge.description}</p>
+              {/* Substance indicator - Helps clarify which tracker triggered this */}
+              <div className="mt-3 inline-flex items-center px-2 py-0.5 rounded-full bg-white/10 text-[10px] text-white/50 border border-white/5 uppercase tracking-wider">
+                For {badge.id === 'first_day' || badge.id === 'streak_7' ? 'tracking' : 'staying free from'}
+              </div>
             </div>
           </div>
         </div>
diff --git a/src/lib/storage.ts b/src/lib/storage.ts
index 6f707fd..d631747 100644
--- a/src/lib/storage.ts
+++ b/src/lib/storage.ts
@@ -546,10 +546,12 @@ export function checkBadgeEligibility(
     case 'streak_3': return streak >= 3;
     case 'streak_7': return stats.totalDays >= 7;
     case 'fighter':
-      return getStreakFromMap(stats.nicotineMap) >= 7 && getStreakFromMap(stats.weedMap) >= 7;
+      // Fix: Check streak for the current substance, not both simultaneously
+      return streak >= 7;
     case 'one_month': return checkMonthlyReduction();
     case 'goal_crusher':
-      return getStreakFromMap(stats.nicotineMap) >= 30 && getStreakFromMap(stats.weedMap) >= 30;
+      // Fix: Check streak for the current substance, not both simultaneously
+      return streak >= 30;
     default: return false;
   }
 }