diff --git a/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt b/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt
index a35204c7c..fd72c2fb1 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/TasksAccount.kt
@@ -138,7 +138,7 @@ class TasksAccount : InjectingPreferenceFragment() {
         (findPreference(R.string.sign_in_with_google) as IconPreference).apply {
             if (account.error.isNullOrBlank()) {
                 isVisible = false
-                return
+                return@apply
             }
             isVisible = true
             when {
diff --git a/app/src/main/res/xml/preferences_tasks.xml b/app/src/main/res/xml/preferences_tasks.xml
index b0b57ed75..bdb4eb748 100644
--- a/app/src/main/res/xml/preferences_tasks.xml
+++ b/app/src/main/res/xml/preferences_tasks.xml
@@ -15,6 +15,7 @@
   <Preference
     android:key="@string/upgrade_to_pro"
     android:title="@string/upgrade_to_pro"
+    android:summary=" "
     app:allowDividerAbove="true"
     app:icon="@drawable/ic_outline_attach_money_24px" />
 
@@ -29,7 +30,8 @@
 
   <PreferenceCategory
     android:key="@string/migrate"
-    android:title="@string/migrate">
+    android:title="@string/migrate"
+    app:isPreferenceVisible="false">
 
     <Preference
       android:key="@string/offline_lists"