diff --git a/src/components/Onboarding/steps/Analytics.js b/src/components/Onboarding/steps/Analytics.js
index 9bfb7f85..ca032261 100644
--- a/src/components/Onboarding/steps/Analytics.js
+++ b/src/components/Onboarding/steps/Analytics.js
@@ -77,7 +77,7 @@ class Analytics extends PureComponent<StepProps, State> {
           category="Onboarding"
           name="Analytics"
           flowType={onboarding.flowType}
-          deviceType={model ? model.productName : ''}
+          deviceType={model.productName}
         />
         <StepContainerInner>
           <Title data-e2e="onboarding_title">{t('onboarding.analytics.title')}</Title>
diff --git a/src/components/Onboarding/steps/Finish.js b/src/components/Onboarding/steps/Finish.js
index ed2c926f..925317cf 100644
--- a/src/components/Onboarding/steps/Finish.js
+++ b/src/components/Onboarding/steps/Finish.js
@@ -77,7 +77,7 @@ export default class Finish extends Component<StepProps, *> {
           category="Onboarding"
           name="Finish"
           flowType={onboarding.flowType}
-          deviceType={model ? model.productName : ''}
+          deviceType={model.productName}
         />
         <ConfettiLayer>
           <ConfettiParty emit={emit} />
diff --git a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckErrorPage.js b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckErrorPage.js
index ef142f1b..9afa0f64 100644
--- a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckErrorPage.js
+++ b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckErrorPage.js
@@ -43,7 +43,7 @@ class GenuineCheckErrorPage extends PureComponent<Props, *> {
         category="Onboarding"
         name={`Genuine Check Error Page - ${page}`}
         flowType={onboarding.flowType}
-        deviceType={model ? model.productName : ''}
+        deviceType={model.productName}
       />
     )
   }
diff --git a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
index b22208d2..0af9fe65 100644
--- a/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
+++ b/src/components/Onboarding/steps/GenuineCheck/GenuineCheckUnavailable.js
@@ -79,7 +79,7 @@ export function GenuineCheckUnavailableMessage({
           handleOpenGenuineCheckModal()
           track('Genuine Check Retry', {
             flowType: onboarding.flowType,
-            deviceType: model ? model.productName : '',
+            deviceType: model.productName,
           })
         }}
       >
diff --git a/src/components/Onboarding/steps/GenuineCheck/index.js b/src/components/Onboarding/steps/GenuineCheck/index.js
index 6a763b14..c1754965 100644
--- a/src/components/Onboarding/steps/GenuineCheck/index.js
+++ b/src/components/Onboarding/steps/GenuineCheck/index.js
@@ -174,7 +174,7 @@ class GenuineCheck extends PureComponent<StepProps, State> {
           category="Onboarding"
           name="Genuine Check"
           flowType={onboarding.flowType}
-          deviceType={model ? model.productName : ''}
+          deviceType={model.productName}
         />
         <StepContainerInner>
           <Title>{t('onboarding.genuineCheck.title')}</Title>
diff --git a/src/components/Onboarding/steps/SelectPIN/index.js b/src/components/Onboarding/steps/SelectPIN/index.js
index bef8b153..1ad65fad 100644
--- a/src/components/Onboarding/steps/SelectPIN/index.js
+++ b/src/components/Onboarding/steps/SelectPIN/index.js
@@ -41,7 +41,7 @@ export default (props: StepProps) => {
           category="Onboarding"
           name="Choose PIN"
           flowType={onboarding.flowType}
-          deviceType={model ? model.productName : ''}
+          deviceType={model.productName}
         />
         {onboarding.flowType === 'restoreDevice' ? (
           <Box grow alignItems="center">
diff --git a/src/components/Onboarding/steps/WriteSeed/index.js b/src/components/Onboarding/steps/WriteSeed/index.js
index afa6d14b..24bb5c7a 100644
--- a/src/components/Onboarding/steps/WriteSeed/index.js
+++ b/src/components/Onboarding/steps/WriteSeed/index.js
@@ -26,7 +26,7 @@ export default (props: StepProps) => {
           category="Onboarding"
           name="Recovery Phase"
           flowType={onboarding.flowType}
-          deviceType={model ? model.productName : ''}
+          deviceType={model.productName}
         />
         <Box grow alignItems="center">
           {onboarding.flowType === 'restoreDevice' ? (