diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultHttpDataSource.java b/library/src/main/java/com/google/android/exoplayer/upstream/DefaultHttpDataSource.java
index 31c672bc80..3f9bf27366 100644
--- a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultHttpDataSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/upstream/DefaultHttpDataSource.java
@@ -272,13 +272,13 @@ public class DefaultHttpDataSource implements HttpDataSource {
         }
       }
     } finally {
+      inputStream = null;
+      closeConnection();
       if (opened) {
         opened = false;
         if (listener != null) {
           listener.onTransferEnd();
         }
-        inputStream = null;
-        closeConnection();
       }
     }
   }