diff --git a/src/NuGetGallery/Scripts/gallery/page-api-keys.js b/src/NuGetGallery/Scripts/gallery/page-api-keys.js
index d919537bbe..986a24fa90 100644
--- a/src/NuGetGallery/Scripts/gallery/page-api-keys.js
+++ b/src/NuGetGallery/Scripts/gallery/page-api-keys.js
@@ -100,6 +100,11 @@
                         function (owner) {
                             return owner.Owner.toUpperCase() == data.Owner.toUpperCase()
                         });
+
+                    if (existingOwner == null) {
+                        existingOwner = { "Owner": data.Owner, "PackageIds": [] };
+                    }
+
                     this.PackageOwner(existingOwner);
                 } else {
                     this.PackageOwner(this.PackageOwners[0]);