diff --git a/app/screens/entry/entry.js b/app/screens/entry/entry.js
index 5485ba404..2ac571df6 100644
--- a/app/screens/entry/entry.js
+++ b/app/screens/entry/entry.js
@@ -63,6 +63,7 @@ export default class Entry extends PureComponent {
         initializeModules: PropTypes.func,
         actions: PropTypes.shape({
             autoUpdateTimezone: PropTypes.func.isRequired,
+            setDeviceToken: PropTypes.func.isRequired,
         }).isRequired,
     };
 
@@ -108,6 +109,7 @@ export default class Entry extends PureComponent {
         const {
             actions: {
                 autoUpdateTimezone,
+                setDeviceToken,
             },
             enableTimezone,
             deviceTimezone,
@@ -136,6 +138,10 @@ export default class Entry extends PureComponent {
                 Client4.setUserId(currentUserId);
             }
 
+            if (app.deviceToken) {
+                setDeviceToken(app.deviceToken);
+            }
+
             this.setStartupThemes();
             this.handleNotification();
             this.loadSystemEmojis();
diff --git a/app/screens/entry/index.js b/app/screens/entry/index.js
index 6941539f1..22bebdae8 100644
--- a/app/screens/entry/index.js
+++ b/app/screens/entry/index.js
@@ -3,6 +3,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
+import {setDeviceToken} from 'mattermost-redux/actions/general';
 import {autoUpdateTimezone} from 'mattermost-redux/actions/timezone';
 import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {isTimezoneEnabled} from 'mattermost-redux/selectors/entities/timezone';
@@ -30,6 +31,7 @@ function mapDispatchToProps(dispatch) {
     return {
         actions: bindActionCreators({
             autoUpdateTimezone,
+            setDeviceToken,
         }, dispatch),
     };
 }