diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index 1c872c37e..c47b880cb 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -88,7 +88,7 @@ public class CallNotificationController extends BaseController {
 
     @BindView(R.id.avatarImageView)
     ImageView avatarImageView;
-    List<Disposable> disposablesList = new ArrayList<>();
+    private List<Disposable> disposablesList = new ArrayList<>();
     private Bundle originalBundle;
     private String roomId;
     private UserEntity userBeingCalled;
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java
index fa7da8172..79f3faa4e 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java
@@ -162,10 +162,13 @@ public class RingtoneSelectionController extends BaseController implements Flexi
         abstractFlexibleItemList.add(new NotificationSoundItem(getResources()
                 .getString(R.string.nc_settings_default_ringtone), ringtoneString));
 
+        boolean foundDefault = false;
+
         String preferencesString = null;
         if ((TextUtils.isEmpty((preferencesString = appPreferences.getCallRingtoneUri())))
                 || TextUtils.isEmpty((preferencesString = appPreferences.getMessageRingtoneUri()))) {
             ((NotificationSoundItem) abstractFlexibleItemList.get(1)).setSelected(true);
+            foundDefault = true;
         }
 
         if (getActivity() != null) {
@@ -181,7 +184,6 @@ public class RingtoneSelectionController extends BaseController implements Flexi
 
             NotificationSoundItem notificationSoundItem;
 
-            boolean foundDefault = false;
             while (cursor.moveToNext()) {
                 String notificationTitle = cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX);
                 String notificationUri = cursor.getString(RingtoneManager.URI_COLUMN_INDEX);