diff --git a/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
index 12044344dd..4628d417b6 100644
--- a/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
+++ b/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
@@ -149,12 +149,20 @@ private void setVideoView() {
     private void updateSurfaceView() {
         View view;
         if (!useTextureView || useSecureView) {
-            view = new SurfaceView(context);
+            if (surfaceView != null && surfaceView instanceof SurfaceView) {
+                view = surfaceView;
+            } else {
+                view = new SurfaceView(context);
+            }
             if (useSecureView) {
                 ((SurfaceView)view).setSecure(true);
             }
         } else {
-            view = new TextureView(context);
+            if (surfaceView != null && surfaceView instanceof TextureView) {
+                view = surfaceView;
+            } else {
+                view = new TextureView(context);
+            }
         }
         view.setLayoutParams(layoutParams);