diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
index d1cfb2e8d6..c5938eb35e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/OnboardingMegaphoneView.java
@@ -140,16 +140,16 @@ public class OnboardingMegaphoneView extends FrameLayout {
         data.add(TYPE_INVITE);
       }
 
-      if (SignalStore.onboarding().shouldShowSms(context)) {
-        data.add(TYPE_SMS);
+      if (SignalStore.onboarding().shouldShowAddPhoto() && !SignalStore.misc().hasEverHadAnAvatar()) {
+        data.add(TYPE_ADD_PHOTO);
       }
 
       if (SignalStore.onboarding().shouldShowAppearance()) {
         data.add(TYPE_APPEARANCE);
       }
 
-      if (SignalStore.onboarding().shouldShowAddPhoto() && !SignalStore.misc().hasEverHadAnAvatar()) {
-        data.add(TYPE_ADD_PHOTO);
+      if (SignalStore.onboarding().shouldShowSms(context)) {
+        data.add(TYPE_SMS);
       }
 
       return data;