diff --git a/src/dash/WebmSegmentBaseLoader.js b/src/dash/WebmSegmentBaseLoader.js
index 80f7f99c8f..7521f8803b 100644
--- a/src/dash/WebmSegmentBaseLoader.js
+++ b/src/dash/WebmSegmentBaseLoader.js
@@ -344,7 +344,8 @@ function WebmSegmentBaseLoader() {
                 request: request,
                 url: media,
                 init: false,
-                mediaType: mediaType
+                mediaType: mediaType,
+                representation
             };
 
             request = _getFragmentRequest(info);
diff --git a/src/streaming/controllers/ExtUrlQueryInfoController.js b/src/streaming/controllers/ExtUrlQueryInfoController.js
index 1a026c81d1..a1c39b80ba 100644
--- a/src/streaming/controllers/ExtUrlQueryInfoController.js
+++ b/src/streaming/controllers/ExtUrlQueryInfoController.js
@@ -154,10 +154,14 @@ function ExtUrlQueryInfoController() {
     function getFinalQueryString(request) {
         try {
             if (!mpdQueryStringInformation) {
-                return
+                return null;
             }
             if (request.type === HTTPRequest.MEDIA_SEGMENT_TYPE || request.type === HTTPRequest.INIT_SEGMENT_TYPE) {
                 const representation = request.representation;
+
+                if (!representation) {
+                    return null;
+                }
                 const adaptation = representation.adaptation;
                 const period = adaptation.period;
                 const queryInfo = mpdQueryStringInformation