diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index eb72f27d41..0e43794c3d 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -151,9 +151,6 @@ namespace MediaBrowser.Api.Playback.Hls
 
             args += string.Format(" -r {0}", framerate);
 
-            // Needed to ensure segments stay under 10 seconds
-            args += string.Format(" -g {0}", framerate);
-
             args += " -vsync vfr";
 
             if (!string.IsNullOrEmpty(state.VideoRequest.Profile))
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index b30a14ecc8..e756bc314b 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -87,12 +87,6 @@ namespace MediaBrowser.Api.Playback.Progressive
             if (string.Equals(Path.GetExtension(outputPath), ".mp4", StringComparison.OrdinalIgnoreCase))
             {
                 format = " -f mp4 -movflags frag_keyframe+empty_moov";
-                var framerate = state.VideoRequest.Framerate ??
-                                state.VideoStream.AverageFrameRate ?? state.VideoStream.RealFrameRate ?? 23.976;
-
-                framerate *= 2;
-
-                keyFrame = " -g " + Math.Round(framerate);
             }
 
             return string.Format("{0} {1} -i {2}{3}{4} -threads 0 {5} {6} {7}{8} \"{9}\"",