diff --git a/frontend/src/component/featureTypes/FeatureTypeEdit/FeatureTypeForm/FeatureTypeForm.tsx b/frontend/src/component/featureTypes/FeatureTypeEdit/FeatureTypeForm/FeatureTypeForm.tsx
index 07e57ac1e1..b9ee0dcb20 100644
--- a/frontend/src/component/featureTypes/FeatureTypeEdit/FeatureTypeForm/FeatureTypeForm.tsx
+++ b/frontend/src/component/featureTypes/FeatureTypeEdit/FeatureTypeForm/FeatureTypeForm.tsx
@@ -79,14 +79,19 @@ export const FeatureTypeForm: VFC<FeatureTypeFormProps> = ({
                 throw new Error('No feature toggle type loaded');
 
             const value = doesntExpire ? 0 : lifetime;
-            await updateFeatureTypeLifetime(featureType?.id, value);
+            await updateFeatureTypeLifetime(featureType.id, value);
             refetch();
             setToastData({
                 title: 'Feature type updated',
                 type: 'success',
             });
             navigate('/feature-toggle-type');
-            tracker.trackEvent('feature-type-edit');
+            tracker.trackEvent('feature-type-edit', {
+                props: {
+                    featureTypeId: featureType.id,
+                    newLifetime: value,
+                },
+            });
         } catch (error: unknown) {
             setToastApiError(formatUnknownError(error));
         }