diff --git a/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Data/FairPlayCombinedDbContext.cs b/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Data/FairPlayCombinedDbContext.cs
index 18e538f3..3bdd6a08 100644
--- a/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Data/FairPlayCombinedDbContext.cs
+++ b/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Data/FairPlayCombinedDbContext.cs
@@ -495,6 +495,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
         modelBuilder.Entity<VideoInfo>(entity =>
         {
+            entity.HasIndex(e => e.YouTubeVideoId, "UI_VideoInfo_YouTubeVideoId")
+                .IsUnique()
+                .HasFilter("YouTubeVideoId IS NOT NULL");
+
             entity.Property(e => e.ApplicationUserId).HasComment("Video Owner Id");
             entity.Property(e => e.RowCreationDateTime).HasDefaultValueSql("GETUTCDATE()");
             entity.Property(e => e.RowCreationUser).HasDefaultValueSql("'Unknown'");
diff --git a/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Models/FairPlayTube/VideoInfo.cs b/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Models/FairPlayTube/VideoInfo.cs
index 9438307e..679bb91b 100644
--- a/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Models/FairPlayTube/VideoInfo.cs
+++ b/src/FairPlayCombinedSln/FairPlayCombined.DataAccess/Models/FairPlayTube/VideoInfo.cs
@@ -17,7 +17,6 @@ namespace FairPlayCombined.DataAccess.Models.FairPlayTubeSchema;
 
 [Table("VideoInfo", Schema = "FairPlayTube")]
 [Index("VideoId", Name = "UI_VideoInfo_VideoId", IsUnique = true)]
-[Index("YouTubeVideoId", Name = "UI_VideoInfo_YouTubeVideoId", IsUnique = true)]
 public partial class VideoInfo
 {
     [Key]
diff --git a/src/FairPlayCombinedSln/FairPlayCombinedDb/FairPlayTube/Tables/VideoInfo.sql b/src/FairPlayCombinedSln/FairPlayCombinedDb/FairPlayTube/Tables/VideoInfo.sql
index 7036a5c8..5414a03c 100644
--- a/src/FairPlayCombinedSln/FairPlayCombinedDb/FairPlayTube/Tables/VideoInfo.sql
+++ b/src/FairPlayCombinedSln/FairPlayCombinedDb/FairPlayTube/Tables/VideoInfo.sql
@@ -47,4 +47,4 @@ CREATE UNIQUE INDEX [UI_VideoInfo_VideoId] ON [FairPlayTube].[VideoInfo] ([Video
 
 GO
 
-CREATE UNIQUE INDEX [UI_VideoInfo_YouTubeVideoId] ON [FairPlayTube].[VideoInfo] ([YouTubeVideoId])
+CREATE UNIQUE INDEX [UI_VideoInfo_YouTubeVideoId] ON [FairPlayTube].[VideoInfo] ([YouTubeVideoId]) WHERE YouTubeVideoId IS NOT NULL