diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
index 96e6d8692..3392dfda9 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
@@ -479,13 +479,11 @@ class SetStatusDialogFragment :
                     }
                 })
         } else {
-            val clearAt = clearAtToUnixTime(selectedPredefinedStatus!!.clearAt)
-
             ncApi.setPredefinedStatusMessage(
                 credentials,
                 ApiUtils.getUrlForSetPredefinedStatus(currentUser?.baseUrl!!),
                 selectedPredefinedStatus!!.id,
-                if (clearAt == -1L) null else clearAt
+                clearAt
             )
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())?.subscribe(object : Observer<GenericOverall> {