diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
index 2ca07a63..cd79c979 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
@@ -159,7 +159,6 @@ public class QtAndroidMediaPlayer extends MediaPlayer
         public void onCompletion(final MediaPlayer mp)
         {
             onMediaPlayerInfoNative(MEDIA_PLAYER_FINISHED, 0, mID);
-            reset();
         }
 
     }
@@ -191,9 +190,9 @@ public class QtAndroidMediaPlayer extends MediaPlayer
         @Override
         public void onPrepared(final MediaPlayer mp)
         {
+            mPreparing = false;
             onMediaPlayerInfoNative(MEDIA_PLAYER_READY, 0, mID);
             onMediaPlayerInfoNative(MEDIA_PLAYER_DURATION, getDuration(), mID);
-            mPreparing = false;
         }
 
     }
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
index 3f3b599a..54c04e5c 100644
--- a/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
+++ b/src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
@@ -344,7 +344,7 @@ void QAndroidMediaPlayerControl::onMediaPlayerInfo(qint32 what, qint32 extra)
         Q_EMIT positionChanged(extra);
         break;
     case JMediaPlayer::MEDIA_PLAYER_FINISHED:
-        setState(QMediaPlayer::StoppedState);
+        stop();
         setMediaStatus(QMediaPlayer::EndOfMedia);
         break;
     }