diff --git a/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts b/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
index e190a60f95..d2106ac21e 100644
--- a/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
+++ b/src/apps/stable/features/playback/utils/mediaSegmentSettings.ts
@@ -8,7 +8,11 @@ const PREFIX = 'segmentTypeAction';
 
 export const getId = (type: MediaSegmentType) => `${PREFIX}__${type}`;
 
-export function getMediaSegmentAction(userSettings: UserSettings, type: MediaSegmentType): MediaSegmentAction | undefined {
+export function getMediaSegmentAction(userSettings: UserSettings, type: MediaSegmentType): MediaSegmentAction {
     const action = userSettings.get(getId(type), false);
-    return action ? action as MediaSegmentAction : undefined;
+    let defaultAction = MediaSegmentAction.None;
+    if (type === MediaSegmentType.Intro || type === MediaSegmentType.Outro) {
+        defaultAction = MediaSegmentAction.AskToSkip;
+    }
+    return action ? action as MediaSegmentAction : defaultAction;
 }
diff --git a/src/components/playbackSettings/playbackSettings.js b/src/components/playbackSettings/playbackSettings.js
index 05374a78d5..81e82d0415 100644
--- a/src/components/playbackSettings/playbackSettings.js
+++ b/src/components/playbackSettings/playbackSettings.js
@@ -65,7 +65,7 @@ function populateMediaSegments(container, userSettings) {
     ].map(segmentType => {
         const segmentTypeLabel = globalize.translate('LabelMediaSegmentsType', globalize.translate(`MediaSegmentType.${segmentType}`));
         const id = getId(segmentType);
-        selectedValues[id] = getMediaSegmentAction(userSettings, segmentType) || MediaSegmentAction.None;
+        selectedValues[id] = getMediaSegmentAction(userSettings, segmentType);
         return `<div class="selectContainer">
 <select is="emby-select" id="${id}" class="segmentTypeAction" label="${segmentTypeLabel}">
     ${actionOptions}