diff --git a/src/main/java/cz/kamma/xtreamplayer/XtreamPlayerApplication.java b/src/main/java/cz/kamma/xtreamplayer/XtreamPlayerApplication.java
index bb2c2af..2cfa127 100644
--- a/src/main/java/cz/kamma/xtreamplayer/XtreamPlayerApplication.java
+++ b/src/main/java/cz/kamma/xtreamplayer/XtreamPlayerApplication.java
@@ -298,8 +298,9 @@ public final class XtreamPlayerApplication {
                     );
                 }
 
-                if (isHlsPlaylist(usedTarget, contentType)) {
-                    String rewritten = rewritePlaylistForProxy(usedTarget, body);
+                URI playlistBaseUri = response.uri() != null ? response.uri() : usedTarget;
+                if (isHlsPlaylist(playlistBaseUri, contentType)) {
+                    String rewritten = rewritePlaylistForProxy(playlistBaseUri, body);
                     exchange.getResponseHeaders().set("Content-Type", "application/vnd.apple.mpegurl; charset=utf-8");
                     writeBytes(exchange, response.statusCode(), rewritten.getBytes(StandardCharsets.UTF_8),
                             "application/vnd.apple.mpegurl; charset=utf-8");