diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp
index 8d3d7a944..2222fe995 100644
--- a/UI/window-basic-main-outputs.cpp
+++ b/UI/window-basic-main-outputs.cpp
@@ -575,6 +575,8 @@ void SimpleOutput::UpdateStreamingSettings_amd(obs_data_t *settings,
 	obs_data_set_int(settings, "AMF.H264.Bitrate.Target", bitrate);
 	obs_data_set_int(settings, "bitrate", bitrate);
 	obs_data_set_int(settings, "AMF.H264.FillerData", 1);
+	obs_data_set_int(settings, "AMF.H264.VBVBuffer", 1);
+	obs_data_set_int(settings, "AMF.H264.VBVBuffer.Size", bitrate);
 	
 	// Picture Control Properties
 	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
@@ -596,6 +598,8 @@ void SimpleOutput::UpdateRecordingSettings_amd_cqp(int cqp)
 	obs_data_set_int(settings, "AMF.H264.QP.IFrame", cqp);
 	obs_data_set_int(settings, "AMF.H264.QP.PFrame", cqp);
 	obs_data_set_int(settings, "AMF.H264.QP.BFrame", cqp);
+	obs_data_set_int(settings, "AMF.H264.VBVBuffer", 1);
+	obs_data_set_int(settings, "AMF.H264.VBVBuffer.Size", 50000);
 
 	// Picture Control Properties
 	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
diff --git a/plugins/enc-amf b/plugins/enc-amf
index 8648badf4..4c2d0d699 160000
--- a/plugins/enc-amf
+++ b/plugins/enc-amf
@@ -1 +1 @@
-Subproject commit 8648badf4293b75106d018329b61a290fe8bb90b
+Subproject commit 4c2d0d6993fe02f8d037118059cd3d698f8e61aa