diff --git a/app/src/main/java/xdsopl/robot36/ImageView.java b/app/src/main/java/xdsopl/robot36/ImageView.java
index c880e72..c36f550 100644
--- a/app/src/main/java/xdsopl/robot36/ImageView.java
+++ b/app/src/main/java/xdsopl/robot36/ImageView.java
@@ -221,6 +221,10 @@ public class ImageView extends SurfaceView implements SurfaceHolder.Callback {
         synchronized (thread) {
             quitThread = true;
         }
+        try {
+            thread.join();
+        } catch (InterruptedException ignore) {
+        }
         audio.stop();
         audio.release();
     }