diff --git a/frontend/src/hooks/useOnboardingData.ts b/frontend/src/hooks/useOnboardingData.ts
index b023562a..d797af0c 100644
--- a/frontend/src/hooks/useOnboardingData.ts
+++ b/frontend/src/hooks/useOnboardingData.ts
@@ -108,15 +108,12 @@ export const useOnboardingData = (): UseOnboardingDataResponse => {
       : []),
   ];
 
-  const sortedChecklistItems = checklistItems.sort(
-    (a, b) => Number(b.checked) - Number(a.checked)
-  );
   const nextStep = checklistItems.find((x) => !x.checked);
 
-  const sortedChecklistItemsWithDisabled = sortedChecklistItems.map((item) => ({
+  const sortedChecklistItems = checklistItems.map((item) => ({
     ...item,
     disabled: item !== nextStep,
   }));
 
-  return { isLoading: false, checklistItems: sortedChecklistItemsWithDisabled };
+  return { isLoading: false, checklistItems: sortedChecklistItems };
 };
diff --git a/frontend/src/screens/wallet/OnboardingChecklist.tsx b/frontend/src/screens/wallet/OnboardingChecklist.tsx
index 666049ae..2fd83ad3 100644
--- a/frontend/src/screens/wallet/OnboardingChecklist.tsx
+++ b/frontend/src/screens/wallet/OnboardingChecklist.tsx
@@ -23,7 +23,7 @@ interface ChecklistItemProps {
 function OnboardingChecklist() {
   const { isLoading, checklistItems } = useOnboardingData();
 
-  if (isLoading) {
+  if (isLoading || !checklistItems.find((x) => !x.checked)) {
     return null;
   }