diff --git a/android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/MainActivity.java b/android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/MainActivity.java
index a8d9bb5..1af5423 100644
--- a/android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/MainActivity.java
+++ b/android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/MainActivity.java
@@ -187,7 +187,7 @@ public class MainActivity extends WearableActivity implements WorkerFragment.OnF
 
         if(ev.getAction() == MotionEvent.ACTION_UP) {
 
-            if(!mTapBpmThread.isAlive()){
+            if(!mTapBpmThread.isAlive() && mTapRecognized){
                 mTapBpmThread.start();
                 mCroller.setLabel("Tippe weiter");
             }
@@ -301,6 +301,7 @@ public class MainActivity extends WearableActivity implements WorkerFragment.OnF
         });
 
         mTapBpm.clearTimestamps();
+        mTapRecognized = false;
         mTapBpmThread.interrupt();
         try {
             mTapBpmThread.join();