diff --git a/ijkmedia/ijkplayer/android/ijkplayer_jni.c b/ijkmedia/ijkplayer/android/ijkplayer_jni.c
index 6f3d0ee98b7bf243c876b0966a34e26cbf18a97f..6834faa80081a42d52e29ac00c52638a56309098 100644
--- a/ijkmedia/ijkplayer/android/ijkplayer_jni.c
+++ b/ijkmedia/ijkplayer/android/ijkplayer_jni.c
@@ -322,9 +322,9 @@ IjkMediaPlayer_release(JNIEnv *env, jobject thiz)
     if (!mp)
         return;
 
+    ijkmp_android_set_surface(env, mp, NULL);
     // explicit shutdown mp, in case it is not the last mp-ref here
     ijkmp_shutdown(mp);
-    ijkmp_android_set_surface(env, mp, NULL);
     //only delete weak_thiz at release
     jobject weak_thiz = (jobject) ijkmp_set_weak_thiz(mp, NULL );
     (*env)->DeleteGlobalRef(env, weak_thiz);