diff --git a/src/UserInput.js b/src/UserInput.js
index 251d136..5123979 100644
--- a/src/UserInput.js
+++ b/src/UserInput.js
@@ -718,6 +718,7 @@ class UserInput extends React.Component {
                                                 !event.target.checked,
                                             burnChecked: false,
                                             isPrivate: true,
+                                            expirationChecked: false
                                         })
                                     }}
                                     size="sm"
diff --git a/src/components/TextStats.js b/src/components/TextStats.js
index f3d4b2b..4742f84 100644
--- a/src/components/TextStats.js
+++ b/src/components/TextStats.js
@@ -51,13 +51,10 @@ class TextStats extends React.Component {
                 >
                     {this.props.expiration_time
                         ? '- Expire on: ' +
-                          new Date(this.props.expiration_time).toLocaleString(
-                              navigator.language
-                          )
+                          new Date(this.props.expiration_time).toLocaleString(navigator.language,{timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone})
                         : ''}
                 </Typography>
 
-
                 {this.props.expiration_height ? <>&nbsp;</> : ''}
                 <Typography
                     level="body2"
@@ -69,9 +66,7 @@ class TextStats extends React.Component {
                 >
                     {this.props.expiration_height
                         ? '- Expire block height: ' +
-                          new Date(this.props.expiration_height).toLocaleString(
-                              navigator.language,{timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone}
-                          )
+                          this.props.expiration_height
                         : ''}
                 </Typography>