diff --git a/src/SdpGenerator.c b/src/SdpGenerator.c
index 4c4ce32..45e235b 100644
--- a/src/SdpGenerator.c
+++ b/src/SdpGenerator.c
@@ -319,9 +319,15 @@ static PSDP_OPTION getAttributesList(char*urlSafeAddr) {
                 }
             }
 
-            // This disables split frame encode on GFE 3.10 which seems to produce broken
-            // HEVC output at 1080p60 (full of artifacts even on the SHIELD itself, go figure)
-            err |= addAttributeString(&optionHead, "x-nv-video[0].encoderFeatureSetting", "0");
+            if (AppVersionQuad[0] < 7 ||
+                (AppVersionQuad[0] == 7 && AppVersionQuad[1] < 1) ||
+                (AppVersionQuad[0] == 7 && AppVersionQuad[1] == 1 && AppVersionQuad[2] < 408)) {
+                // This disables split frame encode on GFE 3.10 which seems to produce broken
+                // HEVC output at 1080p60 (full of artifacts even on the SHIELD itself, go figure).
+                // It now appears to work fine on GFE 3.14.1.
+                Limelog("Disabling split encode for HEVC on older GFE version");
+                err |= addAttributeString(&optionHead, "x-nv-video[0].encoderFeatureSetting", "0");
+            }
         }
         else {