diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
index 110f64d17..f6e0817a0 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/UI/window-basic-settings-stream.cpp
@@ -140,10 +140,11 @@ void OBSBasicSettings::LoadStream1Settings()
 			QTStr("Basic.Settings.Stream.Custom.Password.ToolTip"));
 	} else {
 		int idx = ui->service->findText(service);
-		/* 29.1 crash workaround: Fall back to "Custom" if service not found. */
-		if (idx == -1)
-			idx = 0;
-
+		if (idx == -1) {
+			if (service && *service)
+				ui->service->insertItem(1, service);
+			idx = 1;
+		}
 		ui->service->setCurrentIndex(idx);
 		lastServiceIdx = idx;