diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp
index b1884c0b654ab4d95e4930bebd446780f28707f9..69f247c14f3870609cf0eb65230956fcba0dd7aa 100644
--- a/UI/window-basic-main-outputs.cpp
+++ b/UI/window-basic-main-outputs.cpp
@@ -869,13 +869,15 @@ void SimpleOutput::SetupVodTrack(obs_service_t *service)
 		config_get_bool(main->Config(), "SimpleOutput", "UseAdvanced");
 	bool enable = config_get_bool(main->Config(), "SimpleOutput",
 				      "VodTrackEnabled");
+	bool enableForCustomServer = config_get_bool(
+		GetGlobalConfig(), "General", "EnableCustomServerVodTrack");
 
 	obs_data_t *settings = obs_service_get_settings(service);
 	const char *name = obs_data_get_string(settings, "service");
 
 	const char *id = obs_service_get_id(service);
 	if (strcmp(id, "rtmp_custom") == 0)
-		enable = false;
+		enable = enableForCustomServer ? enable : false;
 	else
 		enable = advanced && enable && ServiceSupportsVodTrack(name);
 
@@ -1635,10 +1637,13 @@ inline void AdvancedOutput::SetupVodTrack(obs_service_t *service)
 		config_get_bool(main->Config(), "AdvOut", "VodTrackEnabled");
 	int vodTrackIndex =
 		config_get_int(main->Config(), "AdvOut", "VodTrackIndex");
+	bool enableForCustomServer = config_get_bool(
+		GetGlobalConfig(), "General", "EnableCustomServerVodTrack");
 
 	const char *id = obs_service_get_id(service);
 	if (strcmp(id, "rtmp_custom") == 0) {
-		vodTrackEnabled = false;
+		vodTrackEnabled = enableForCustomServer ? vodTrackEnabled
+							: false;
 	} else {
 		obs_data_t *settings = obs_service_get_settings(service);
 		const char *service = obs_data_get_string(settings, "service");
diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
index 133d9351ca630f93d2e2cc7852c61b24587dfe9c..2189ed5a8e25cdf99267732559cc8ddf89055727 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
@@ -619,9 +619,14 @@ void OBSBasicSettings::on_useAuth_toggled()
 
 void OBSBasicSettings::UpdateVodTrackSetting()
 {
+	bool enableForCustomServer = config_get_bool(
+		GetGlobalConfig(), "General", "EnableCustomServerVodTrack");
 	bool enableVodTrack = ui->service->currentText() == "Twitch";
 	bool wasEnabled = !!vodTrackCheckbox;
 
+	if (enableForCustomServer && IsCustomService())
+		enableVodTrack = true;
+
 	if (enableVodTrack == wasEnabled)
 		return;