diff --git a/app/screens/load_team/load_team.js b/app/screens/load_team/load_team.js
index b079eede3..c788e79b4 100644
--- a/app/screens/load_team/load_team.js
+++ b/app/screens/load_team/load_team.js
@@ -27,17 +27,14 @@ export default class LoadTeam extends PureComponent {
     };
 
     componentDidMount() {
-        const {currentTeam, myMembers, teams} = this.props;
+        const {notification, currentTeam, myMembers, teams} = this.props;
+        const {clearNotification, goToNotification} = this.props.actions;
 
-        // TODO: GO TO CHANNEL WHEN NOTIFICATION IS TAPPED AND THE APP IS CLOSED
-        // const {notification, currentTeam, myMembers, teams} = this.props;
-        // const {clearNotification, goToNotification} = this.props.actions;
-
-        // if (notification) {
-        //     clearNotification();
-            // goToNotification(notification);
-            // this.goToChannelView();
-        if (currentTeam) {
+        if (notification) {
+            clearNotification();
+            goToNotification(notification);
+            this.goToChannelView();
+        } else if (currentTeam) {
             this.onSelectTeam(currentTeam);
         } else if (!currentTeam) {
             this.selectFirstTeam(teams, myMembers);