diff --git a/src/Core/Auth/Entities/EmergencyAccess.cs b/src/Core/Auth/Entities/EmergencyAccess.cs
index 908bd32145..df66541d2a 100644
--- a/src/Core/Auth/Entities/EmergencyAccess.cs
+++ b/src/Core/Auth/Entities/EmergencyAccess.cs
@@ -11,8 +11,8 @@ public class EmergencyAccess : ITableObject<Guid>
     public Guid GrantorId { get; set; }
     public Guid? GranteeId { get; set; }
     [MaxLength(256)]
-    public required string Email { get; set; }
-    public required string KeyEncrypted { get; set; }
+    public string? Email { get; set; }
+    public string? KeyEncrypted { get; set; }
     public EmergencyAccessType Type { get; set; }
     public EmergencyAccessStatusType Status { get; set; }
     public short WaitTimeDays { get; set; }
diff --git a/src/Core/Auth/Models/Data/EmergencyAccessDetails.cs b/src/Core/Auth/Models/Data/EmergencyAccessDetails.cs
index 47667b38d2..b179f67af5 100644
--- a/src/Core/Auth/Models/Data/EmergencyAccessDetails.cs
+++ b/src/Core/Auth/Models/Data/EmergencyAccessDetails.cs
@@ -5,7 +5,7 @@ namespace Bit.Core.Auth.Models.Data;
 public class EmergencyAccessDetails : EmergencyAccess
 {
     public string? GranteeName { get; set; }
-    public required string GranteeEmail { get; set; }
+    public string? GranteeEmail { get; set; }
     public string? GranteeAvatarColor { get; set; }
     public string? GrantorName { get; set; }
     public required string GrantorEmail { get; set; }
diff --git a/test/Core.Test/Auth/UserFeatures/EmergencyAccess/DeleteEmergencyAccessCommandTests.cs b/test/Core.Test/Auth/UserFeatures/EmergencyAccess/DeleteEmergencyAccessCommandTests.cs
index 7c6d421dff..0b47b97472 100644
--- a/test/Core.Test/Auth/UserFeatures/EmergencyAccess/DeleteEmergencyAccessCommandTests.cs
+++ b/test/Core.Test/Auth/UserFeatures/EmergencyAccess/DeleteEmergencyAccessCommandTests.cs
@@ -49,6 +49,8 @@ public class DeleteEmergencyAccessCommandTests
             Id = emergencyAccessId,
             GrantorId = grantorId,
             GranteeId = granteeId,
+            GranteeEmail = "grantee@test.dev",
+            GrantorEmail = "grantor@test.dev",
             Status = EmergencyAccessStatusType.Confirmed,
             Type = EmergencyAccessType.View
         };
@@ -101,6 +103,8 @@ public class DeleteEmergencyAccessCommandTests
             Id = Guid.NewGuid(),
             GrantorId = grantorId,
             GranteeId = Guid.NewGuid(),
+            GranteeEmail = "grantee@test.dev",
+            GrantorEmail = "grantor@test.dev",
             Status = EmergencyAccessStatusType.Confirmed,
             Type = EmergencyAccessType.View
         };
@@ -110,6 +114,8 @@ public class DeleteEmergencyAccessCommandTests
             Id = Guid.NewGuid(),
             GrantorId = grantorId,
             GranteeId = Guid.NewGuid(),
+            GranteeEmail = "grantee@test.dev",
+            GrantorEmail = "grantor@test.dev",
             Status = EmergencyAccessStatusType.Invited,
             Type = EmergencyAccessType.Takeover
         };
@@ -119,6 +125,8 @@ public class DeleteEmergencyAccessCommandTests
             Id = Guid.NewGuid(),
             GrantorId = grantorId,
             GranteeId = Guid.NewGuid(),
+            GranteeEmail = "grantee@test.dev",
+            GrantorEmail = "grantor@test.dev",
             Type = EmergencyAccessType.View
         };
 
@@ -157,6 +165,8 @@ public class DeleteEmergencyAccessCommandTests
             Id = emergencyAccessId,
             GrantorId = grantorId,
             GranteeId = granteeId,
+            GranteeEmail = "grantee@test.dev",
+            GrantorEmail = "grantor@test.dev",
             Status = EmergencyAccessStatusType.Confirmed,
             Type = EmergencyAccessType.Takeover
         };