diff --git a/app/build.gradle b/app/build.gradle
index af8b44a..e65afaa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 44
-        versionName "1.1.23"
+        versionCode 45
+        versionName "1.1.24"
     }
     signingConfigs {
         release {
diff --git a/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java b/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java
index e087334..d7a4458 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java
@@ -308,6 +308,13 @@ public class PitchView extends ViewGroup {
             int cut = data.size() - max;
             data.subList(0, cut).clear();
             samples += cut;
+
+            int m = data.size() - 1;
+            // screen rotate may cause play/edit offsets off screen
+            if (editPos > m)
+                editPos = m;
+            if (playPos > m)
+                playPos = m;
         }
     }