diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp
index dac83b6b1..7bae3a29d 100644
--- a/UI/window-basic-main-outputs.cpp
+++ b/UI/window-basic-main-outputs.cpp
@@ -505,7 +505,6 @@ void SimpleOutput::UpdateStreamingSettings_amd(obs_data_t *settings,
 	obs_data_set_int(settings, "AMF.H264.Usage", 0);
 	obs_data_set_int(settings, "AMF.H264.Profile", 100); // High
 	obs_data_set_string(settings, "profile", "high"); // High
-	obs_data_set_int(settings, "AMF.H264.ProfileLevel", 0); // Automatic
 	
 	// Rate Control Properties
 	obs_data_set_int(settings, "AMF.H264.RateControlMethod", 1);
@@ -513,8 +512,6 @@ 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", 0); // Automatic VBV Buffer
-	obs_data_set_double(settings, "AMF.H264.VBVBuffer.Strictness", 0.9);
 	
 	// Picture Control Properties
 	obs_data_set_double(settings, "AMF.H264.KeyframeInterval", 2.0);
@@ -529,9 +526,8 @@ void SimpleOutput::UpdateRecordingSettings_amd_cqp(int cqp)
 	obs_data_set_int(settings, "AMF.H264.Usage", 0);
 	obs_data_set_int(settings, "AMF.H264.Profile", 100); // High
 	obs_data_set_string(settings, "profile", "high"); // High
-	obs_data_set_int(settings, "AMF.H264.ProfileLevel", 0); // Automatic
 
-															// Rate Control Properties
+	// Rate Control Properties
 	obs_data_set_int(settings, "AMF.H264.RateControlMethod", 0);
 	obs_data_set_string(settings, "rate_control", "CQP");
 	obs_data_set_int(settings, "AMF.H264.QP.IFrame", cqp);
diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
index 7e94a6aa4..7821166f5 100644
--- a/UI/window-basic-settings.cpp
+++ b/UI/window-basic-settings.cpp
@@ -1206,6 +1206,8 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
 			"QSVPreset");
 	const char *nvPreset = config_get_string(main->Config(), "SimpleOutput",
 			"NVENCPreset");
+	const char* amdPreset = config_get_string(main->Config(), "SimpleOutput",
+			"AMDPreset");
 	const char *custom = config_get_string(main->Config(), "SimpleOutput",
 			"x264Settings");
 	const char *recQual = config_get_string(main->Config(), "SimpleOutput",
@@ -1218,6 +1220,7 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
 	curPreset = preset;
 	curQSVPreset = qsvPreset;
 	curNVENCPreset = nvPreset;
+	curAMDPreset = amdPreset;
 
 	audioBitrate = FindClosestAvailableAACBitrate(audioBitrate);
 
diff --git a/plugins/enc-amf b/plugins/enc-amf
index a35691e51..b3e2a98dd 160000
--- a/plugins/enc-amf
+++ b/plugins/enc-amf
@@ -1 +1 @@
-Subproject commit a35691e51cbe19c50e2c911b4bfbea602dc3edca
+Subproject commit b3e2a98ddaa2aca3ead85209e33a1583601add00