diff --git a/src/background.ts b/src/background.ts
index c3a08f43..77f17fd9 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -184,7 +184,7 @@ function submitVote(type, UUID, callback) {
     });
 }
 
-async function submitTimes(videoID, callback) {
+async function submitTimes(videoID: string, callback) {
     //get the video times from storage
     let sponsorTimes = Config.config.sponsorTimes.get(videoID);
     let userID = Config.config.userID;
diff --git a/src/components/SponsorTimeEditComponent.tsx b/src/components/SponsorTimeEditComponent.tsx
index 118bd074..5bd59fa9 100644
--- a/src/components/SponsorTimeEditComponent.tsx
+++ b/src/components/SponsorTimeEditComponent.tsx
@@ -248,7 +248,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
         sponsorTimesSubmitting[this.props.index].category = this.categoryOptionRef.current.value;
 
-        Config.config.sponsorTimes.set(this.props.contentContainer().sponsorVideoID, sponsorTimesSubmitting);
+        Config.config.sponsorTimes.set(this.props.contentContainer().sponsorVideoID, utils.getSegmentsFromSponsorTimes(sponsorTimesSubmitting));
 
         this.props.contentContainer().updatePreviewBar();
     }
diff --git a/src/content.ts b/src/content.ts
index 1646e5ec..8cb43380 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1308,6 +1308,9 @@ function vote(type, UUID, skipNotice?: SkipNoticeComponent) {
 
     let sponsorIndex = utils.getSponsorIndexFromUUID(sponsorTimes, UUID);
 
+    // Don't vote for preview sponsors
+    if (sponsorIndex == -1 || sponsorTimes[sponsorIndex].UUID === null) return;
+
     // See if the local time saved count and skip count should be saved
     if (type == 0 && sponsorSkipped[sponsorIndex] || type == 1 && !sponsorSkipped[sponsorIndex]) {
         let factor = 1;