diff --git a/server/src/pages/shot/controller.js b/server/src/pages/shot/controller.js
index e4abfd7219..a57b682e28 100644
--- a/server/src/pages/shot/controller.js
+++ b/server/src/pages/shot/controller.js
@@ -137,7 +137,7 @@ exports.changeShotExpiration = function(shot, expiration) {
       if (expiration === 0) {
         model.shot.expireTime = model.expireTime = null;
       } else {
-        model.shot.expireTime = model.expireTime = new Date(Date.now() + expiration);
+        model.shot.expireTime = model.expireTime = Date.now() + expiration;
       }
       render();
     }
diff --git a/server/src/pages/shot/view.js b/server/src/pages/shot/view.js
index aa3d90cb67..a230508f19 100644
--- a/server/src/pages/shot/view.js
+++ b/server/src/pages/shot/view.js
@@ -652,6 +652,7 @@ class ExpireWidget extends React.Component {
     value = parseInt(value, 10);
     // Note: sendEvent done in onSaveExpire
     this.props.onSaveExpire(value);
+    this.props.onChanging(false);
     this.setState({isChangingExpire: false});
   }
 }