diff --git a/mms-lib/src/mms_task_notification.c b/mms-lib/src/mms_task_notification.c
index e6f1f21..7f24901 100644
--- a/mms-lib/src/mms_task_notification.c
+++ b/mms-lib/src/mms_task_notification.c
@@ -307,9 +307,6 @@ mms_task_notification_new(
             config, handler, "Notification", NULL, imsi);
         ind->push = g_bytes_ref(bytes);
         ind->pdu = pdu;
-        if (pdu->type == MMS_MESSAGE_TYPE_NOTIFICATION_IND) {
-            ind->task.deadline = pdu->ni.expiry;
-        }
         return &ind->task;
     } else {
         MMS_ERROR(error, MMS_LIB_ERROR_DECODE, "Failed to decode MMS PDU");
diff --git a/mms-lib/src/mms_task_retrieve.c b/mms-lib/src/mms_task_retrieve.c
index 23ce7ce..4ef4665 100644
--- a/mms-lib/src/mms_task_retrieve.c
+++ b/mms-lib/src/mms_task_retrieve.c
@@ -129,7 +129,9 @@ mms_task_retrieve_new(
         MMSTaskRetrieve* retrieve = mms_task_http_alloc(
             MMS_TYPE_TASK_RETRIEVE, config, handler, "Retrieve", id, imsi,
             pdu->ni.location, MMS_RETRIEVE_CONF_FILE, NULL);
-        retrieve->http.task.deadline = pdu->ni.expiry;
+        if (retrieve->http.task.deadline > pdu->ni.expiry) {
+            retrieve->http.task.deadline = pdu->ni.expiry;
+        }
         retrieve->transaction_id = g_strdup(pdu->transaction_id);
         return &retrieve->http.task;
     } else {