diff --git a/rtv/templates/mailcap b/rtv/templates/mailcap
index 133c800..b0a24a0 100644
--- a/rtv/templates/mailcap
+++ b/rtv/templates/mailcap
@@ -34,8 +34,8 @@ video/x-youtube; vlc '%s' --width 640 --height 480; test=test -n "$DISPLAY"
 video/x-youtube; youtube-dl -q -o - '%s' | mpv - --autofit 640x480; test=test -n "$DISPLAY"
 
 # Mpv is a simple and effective video streamer
-video/webm; mpv '%s' --autofit 640x480; test=test -n "$DISPLAY"
-video/*; mpv '%s' --autofit 640x480; test=test -n "$DISPLAY"
+video/webm; mpv '%s' --autofit 640x480 --loop=inf; test=test -n "$DISPLAY"
+video/*; mpv '%s' --autofit 640x480 --loop=inf; test=test -n "$DISPLAY"
 
 ###############################################################################
 # Commands below this point will attempt to display media directly in the
diff --git a/rtv/templates/rtv.cfg b/rtv/templates/rtv.cfg
index e9776e1..bb80145 100644
--- a/rtv/templates/rtv.cfg
+++ b/rtv/templates/rtv.cfg
@@ -35,7 +35,7 @@ clear_auth = False
 history_size = 200
 
 ; Open external links using programs defined in the mailcap config.
-enable_media = True
+enable_media = False
 
 ################
 # OAuth Settings