diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt
index fc5c0859..5c4ceff3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ContactActivity.kt
@@ -47,7 +47,7 @@ abstract class ContactActivity : SimpleActivity() {
         } else if (requestCode == INTENT_SELECT_RINGTONE && resultCode == Activity.RESULT_OK && resultData != null) {
             val extras = resultData.extras
             if (extras?.containsKey(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) == true) {
-                val uri = extras.getParcelable<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) ?: return
+                val uri = extras.getParcelable<Uri>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
                 try {
                     systemRingtoneSelected(uri)
                 } catch (e: Exception) {
@@ -59,7 +59,7 @@ abstract class ContactActivity : SimpleActivity() {
 
     abstract fun customRingtoneSelected(ringtonePath: String)
 
-    abstract fun systemRingtoneSelected(uri: Uri)
+    abstract fun systemRingtoneSelected(uri: Uri?)
 
     fun showPhotoPlaceholder(photoView: ImageView) {
         val placeholder = BitmapDrawable(resources, getBigLetterPlaceholder(contact?.getNameToDisplay() ?: "A"))
@@ -88,7 +88,13 @@ abstract class ContactActivity : SimpleActivity() {
             .apply(options)
             .override(wantedWidth, wantedHeight)
             .listener(object : RequestListener<Drawable> {
-                override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
+                override fun onResourceReady(
+                    resource: Drawable?,
+                    model: Any?,
+                    target: Target<Drawable>?,
+                    dataSource: DataSource?,
+                    isFirstResource: Boolean
+                ): Boolean {
                     photoView.background = ColorDrawable(0)
                     bottomShadow.beVisible()
                     return false
@@ -152,12 +158,14 @@ abstract class ContactActivity : SimpleActivity() {
         return if (type == BaseTypes.TYPE_CUSTOM) {
             label
         } else {
-            getString(when (type) {
-                Email.TYPE_HOME -> R.string.home
-                Email.TYPE_WORK -> R.string.work
-                Email.TYPE_MOBILE -> R.string.mobile
-                else -> R.string.other
-            })
+            getString(
+                when (type) {
+                    Email.TYPE_HOME -> R.string.home
+                    Email.TYPE_WORK -> R.string.work
+                    Email.TYPE_MOBILE -> R.string.mobile
+                    else -> R.string.other
+                }
+            )
         }
     }
 
@@ -165,11 +173,13 @@ abstract class ContactActivity : SimpleActivity() {
         return if (type == BaseTypes.TYPE_CUSTOM) {
             label
         } else {
-            getString(when (type) {
-                StructuredPostal.TYPE_HOME -> R.string.home
-                StructuredPostal.TYPE_WORK -> R.string.work
-                else -> R.string.other
-            })
+            getString(
+                when (type) {
+                    StructuredPostal.TYPE_HOME -> R.string.home
+                    StructuredPostal.TYPE_WORK -> R.string.work
+                    else -> R.string.other
+                }
+            )
         }
     }
 
@@ -177,16 +187,18 @@ abstract class ContactActivity : SimpleActivity() {
         return if (type == Im.PROTOCOL_CUSTOM) {
             label
         } else {
-            getString(when (type) {
-                Im.PROTOCOL_AIM -> R.string.aim
-                Im.PROTOCOL_MSN -> R.string.windows_live
-                Im.PROTOCOL_YAHOO -> R.string.yahoo
-                Im.PROTOCOL_SKYPE -> R.string.skype
-                Im.PROTOCOL_QQ -> R.string.qq
-                Im.PROTOCOL_GOOGLE_TALK -> R.string.hangouts
-                Im.PROTOCOL_ICQ -> R.string.icq
-                else -> R.string.jabber
-            })
+            getString(
+                when (type) {
+                    Im.PROTOCOL_AIM -> R.string.aim
+                    Im.PROTOCOL_MSN -> R.string.windows_live
+                    Im.PROTOCOL_YAHOO -> R.string.yahoo
+                    Im.PROTOCOL_SKYPE -> R.string.skype
+                    Im.PROTOCOL_QQ -> R.string.qq
+                    Im.PROTOCOL_GOOGLE_TALK -> R.string.hangouts
+                    Im.PROTOCOL_ICQ -> R.string.icq
+                    else -> R.string.jabber
+                }
+            )
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
index 892ee6f7..914ba5a9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
@@ -533,7 +533,9 @@ class EditContactActivity : ContactActivity() {
         }
 
         val ringtone = contact!!.ringtone
-        if (ringtone != null && ringtone.isNotEmpty()) {
+        if (ringtone?.isEmpty() == true) {
+            contact_ringtone.text = getString(R.string.no_sound)
+        } else if (ringtone?.isNotEmpty() == true) {
             if (ringtone == SILENT) {
                 contact_ringtone.text = getString(R.string.no_sound)
             } else {
@@ -1317,8 +1319,8 @@ class EditContactActivity : ContactActivity() {
         contact_ringtone.text = ringtonePath.getFilenameFromPath()
     }
 
-    override fun systemRingtoneSelected(uri: Uri) {
-        contact!!.ringtone = uri.toString()
+    override fun systemRingtoneSelected(uri: Uri?) {
+        contact!!.ringtone = uri?.toString()
         val contactRingtone = RingtoneManager.getRingtone(this, uri)
         contact_ringtone.text = contactRingtone.getTitle(this)
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
index c7825a39..74fd0ea7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
@@ -613,7 +613,9 @@ class ViewContactActivity : ContactActivity() {
             contact_ringtone.beVisible()
 
             val ringtone = contact!!.ringtone
-            if (ringtone != null && ringtone.isNotEmpty()) {
+            if (ringtone?.isEmpty() == true) {
+                contact_ringtone.text = getString(R.string.no_sound)
+            } else if (ringtone?.isNotEmpty() == true) {
                 if (ringtone == SILENT) {
                     contact_ringtone.text = getString(R.string.no_sound)
                 } else {
@@ -703,7 +705,7 @@ class ViewContactActivity : ContactActivity() {
         ringtoneUpdated(ringtonePath)
     }
 
-    override fun systemRingtoneSelected(uri: Uri) {
+    override fun systemRingtoneSelected(uri: Uri?) {
         val contactRingtone = RingtoneManager.getRingtone(this, uri)
         contact_ringtone.text = contactRingtone.getTitle(this)
         ringtoneUpdated(uri.toString())
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
index 59795654..96db9435 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
@@ -1097,7 +1097,7 @@ class ContactsHelper(val context: Context) {
                 val uri = Uri.withAppendedPath(Contacts.CONTENT_URI, contact.contactId.toString())
                 val contentValues = ContentValues(2)
                 contentValues.put(Contacts.STARRED, contact.starred)
-                contentValues.put(Contacts.CUSTOM_RINGTONE, contact.ringtone)
+                contentValues.put(Contacts.CUSTOM_RINGTONE, contact.ringtone ?: "")
                 context.contentResolver.update(uri, contentValues, null, null)
             } catch (e: Exception) {
                 context.showErrorToast(e)