diff --git a/spec/APNS.spec.js b/spec/APNS.spec.js
index c56e35d5..90b485c2 100644
--- a/spec/APNS.spec.js
+++ b/spec/APNS.spec.js
@@ -84,7 +84,7 @@ describe('APNS', () => {
       'key': 'value',
       'keyAgain': 'valueAgain'
     });
-    expect(notification.expiry).toEqual(expirationTime);
+    expect(notification.expiry).toEqual(expirationTime/1000);
     done();
   });
 
@@ -298,7 +298,7 @@ describe('APNS', () => {
     var args = conn.pushNotification.calls.first().args;
     var notification = args[0];
     expect(notification.alert).toEqual(data.data.alert);
-    expect(notification.expiry).toEqual(data['expiration_time']);
+    expect(notification.expiry).toEqual(data['expiration_time']/1000);
     var apnDevice = args[1]
     expect(apnDevice.connIndex).toEqual(0);
     expect(apnDevice.appIdentifier).toEqual('bundleId');
diff --git a/src/APNS.js b/src/APNS.js
index 16d8aae7..fa801a52 100644
--- a/src/APNS.js
+++ b/src/APNS.js
@@ -201,6 +201,7 @@ function chooseConns(conns, device) {
 /**
  * Generate the apns notification from the data we get from api request.
  * @param {Object} coreData The data field under api request body
+ * @param {number} expirationTime The expiration time in milliseconds since Jan 1 1970
  * @returns {Object} A apns notification
  */
 function generateNotification(coreData, expirationTime) {
@@ -231,7 +232,7 @@ function generateNotification(coreData, expirationTime) {
     }
   }
   notification.payload = payload;
-  notification.expiry = expirationTime;
+  notification.expiry = expirationTime / 1000;
   return notification;
 }