diff --git a/menu.js b/menu.js
index acdf5666..6decc015 100644
--- a/menu.js
+++ b/menu.js
@@ -59,7 +59,12 @@ const mainMenuTemplate = (win) => {
 						};
 					}
 
-					return pluginEnabledMenu(plugin);
+					let pluginLabel = plugin;
+					if (pluginLabel === "crossfade") {
+						pluginLabel = "crossfade [beta]";
+					}
+
+					return pluginEnabledMenu(plugin, pluginLabel);
 				}),
 			],
 		},
diff --git a/plugins/crossfade/front.js b/plugins/crossfade/front.js
index f08d7d87..406bbbee 100644
--- a/plugins/crossfade/front.js
+++ b/plugins/crossfade/front.js
@@ -111,6 +111,9 @@ const onApiLoaded = () => {
 	watchVideoIDChanges(async (videoID) => {
 		await waitForTransition;
 		const url = await getStreamURL(videoID);
+		if (!url) {
+			return;
+		}
 		await createAudioForCrossfade(url);
 	});
 };