diff --git a/.idea/misc.xml b/.idea/misc.xml
index b0c7b20..e0d5b93 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 44221ad..2eee4b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "adrienmalin.pingpoints"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 8
-        versionName "2.1"
+        versionCode 9
+        versionName "2.3"
         vectorDrawables.useSupportLibrary true
     }
     buildTypes {
diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
index 0cfa21f..e0e0306 100644
--- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
@@ -104,27 +104,37 @@ class SttDialog : DialogFragment() {
                         putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true)
                         putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, true)
                     }
-                    stt = SpeechRecognizer.createSpeechRecognizer(activity).apply {
-                        setRecognitionListener(SttListener())
-                        try {
-                            stopListening()
-                            startListening(sttIntent)
-                        } catch (e: ActivityNotFoundException) {
-                            sttEnabled = false
-                            dismiss()
-                            showPopUp(R.string.STT_unavailable)
-                        }
-                    }
                 }
             }
         }
     }.create()!!
 
-    override fun onStop() {
+    override fun onResume() {
+        super.onResume()
+
+        matchActivity?.apply {
+            matchModel?.apply {
+                stt?.destroy()
+                stt = SpeechRecognizer.createSpeechRecognizer(activity).apply {
+                    setRecognitionListener(SttListener())
+                    try {
+                        stopListening()
+                        startListening(sttIntent)
+                    } catch (e: ActivityNotFoundException) {
+                        sttEnabled = false
+                        dismiss()
+                        showPopUp(R.string.STT_unavailable)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onPause() {
         unMuteAudio()
         stt?.stopListening()
         stt?.destroy()
-        super.onStop()
+        super.onPause()
     }
 
     @Suppress("DEPRECATION")
diff --git a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
index fd9a590..6c8a0f6 100644
--- a/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/VictoryActivity.kt
@@ -28,7 +28,6 @@ class VictoryActivity : AppCompatActivity() {
         previousMatch = getPreferences(Context.MODE_PRIVATE)
         initVictoryModel()
         updateUI()
-        saveScore()
     }
 
     fun initVictoryModel() {
@@ -76,7 +75,7 @@ class VictoryActivity : AppCompatActivity() {
         }
     }
 
-    fun saveScore() {
+    override fun onStop() {
         victoryModel?.apply {
             previousMatch?.edit()?.apply {
                 putString(
@@ -92,6 +91,7 @@ class VictoryActivity : AppCompatActivity() {
                 commit()
             }
         }
+        super.onStop()
     }
 
     fun newMatch(view: View) {