diff --git a/SwimTracker/package.json b/SwimTracker/package.json
index d359268..6d688a3 100644
--- a/SwimTracker/package.json
+++ b/SwimTracker/package.json
@@ -21,12 +21,11 @@
     "expo-status-bar": "~1.6.0",
     "i18n-js": "^4.3.2",
     "immutable": "^5.0.0-beta.4",
-    "moment": "^2.29.4",
     "msgpack-lite": "^0.1.26",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-native": "0.72.6",
-    "react-native-gesture-handler": "~2.12.0",
+    "react-native-gesture-handler": "^2.13.4",
     "react-native-safe-area-context": "4.6.3",
     "react-native-screens": "~3.22.0",
     "react-native-svg": "13.9.0",
diff --git a/SwimTracker/views/TrainingView.js b/SwimTracker/views/TrainingView.js
index b8bfc05..2cf874e 100644
--- a/SwimTracker/views/TrainingView.js
+++ b/SwimTracker/views/TrainingView.js
@@ -78,6 +78,10 @@ function TrainingView(props) {
     props.navigation.navigate('Home');
   };
 
+  if(props.connState != ConnState.CONNECTED_RUNNING) {
+    props.navigation.gotBack();
+  }
+
   return (
     <View style={{ flex: 1 }}>
       <StatusBar hidden={true} />
@@ -113,6 +117,7 @@ const trainingViewStyles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
   return {
+    connState: state.connState,
     session: state.deviceState,
     peaksPerLap: state.settings.analysis.peaksPerLap,
     theme: state.settings.theme,
diff --git a/SwimTracker/yarn.lock b/SwimTracker/yarn.lock
index 18f7b26..feaa6a4 100644
--- a/SwimTracker/yarn.lock
+++ b/SwimTracker/yarn.lock
@@ -6269,11 +6269,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -7286,10 +7281,10 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-react-native-gesture-handler@~2.12.0:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.12.1.tgz#f11a99fb95169810c6886fad5efa01a17fd81660"
-  integrity sha512-deqh36bw82CFUV9EC4tTo2PP1i9HfCOORGS3Zmv71UYhEZEHkzZv18IZNPB+2Awzj45vLIidZxGYGFxHlDSQ5A==
+react-native-gesture-handler@^2.13.4:
+  version "2.13.4"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.13.4.tgz#6a99384330278c4488bcfc7f1814be3e0d7401fd"
+  integrity sha512-smpYOVbvWABpq2H+lmDnfOLCTH934aUPO1w2/pQXvm1j+M/vmGQmvgRDJOpXcks17HLtNNKXD6tcODf3aPqDfA==
   dependencies:
     "@egjs/hammerjs" "^2.0.17"
     hoist-non-react-statics "^3.3.0"