diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
index 4a0b39c4..80a4ffdd 100644
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -590,7 +590,7 @@
         "message": "Wrong Category"
     },
     "nonMusicCategoryOnMusic": {
-        "message": "This video is categorized as music. Are you sure you would like to submit segments with non-music categories? Unless this video is not actually music, you should not be submitting this segment. Please read the guidelines if you are confused."
+        "message": "This video is categorized as music. Are you sure you this has a sponsor? If this is actually a \"Non-Music segment\", open up the extension options and enable this category. Then, you can submit this segment as \"Non-Music\" instead of sponsor. Please read the guidelines if you are confused."
     },
     "multipleSegments": {
         "message": "Multiple Segments"
diff --git a/src/components/SubmissionNoticeComponent.tsx b/src/components/SubmissionNoticeComponent.tsx
index aa59b3c2..610ee490 100644
--- a/src/components/SubmissionNoticeComponent.tsx
+++ b/src/components/SubmissionNoticeComponent.tsx
@@ -178,7 +178,7 @@ class SubmissionNoticeComponent extends React.Component<SubmissionNoticeProps, S
         // Check if any non music categories are being used on a music video
         if (this.contentContainer().videoInfo?.microformat?.playerMicroformatRenderer?.category === "Music") {
             for (const sponsorTime of sponsorTimesSubmitting) {
-                if (!sponsorTime.category.startsWith("music_")) {
+                if (sponsorTime.category === "sponsor") {
                     if (!confirm(chrome.i18n.getMessage("nonMusicCategoryOnMusic"))) return;
 
                     break;