diff --git a/src/Discord.Net.Core/API/Common/Application.cs b/src/Discord.Net.Core/API/Common/Application.cs
index f9fabe57d..e72c6ce79 100644
--- a/src/Discord.Net.Core/API/Common/Application.cs
+++ b/src/Discord.Net.Core/API/Common/Application.cs
@@ -11,13 +11,14 @@ namespace Discord.API
         public string[] RPCOrigins { get; set; }
         [JsonProperty("name")]
         public string Name { get; set; }
-        [JsonProperty("flags"), Int53]
-        public ulong Flags { get; set; }
-        [JsonProperty("owner")]
-        public User Owner { get; set; }
         [JsonProperty("id")]
         public ulong Id { get; set; }
         [JsonProperty("icon")]
         public string Icon { get; set; }
+
+        [JsonProperty("flags"), Int53]
+        public Optional<ulong> Flags { get; set; }
+        [JsonProperty("owner")]
+        public Optional<User> Owner { get; set; }
     }
 }
diff --git a/src/Discord.Net.Rest/Entities/RestApplication.cs b/src/Discord.Net.Rest/Entities/RestApplication.cs
index 26456c79c..f06f03485 100644
--- a/src/Discord.Net.Rest/Entities/RestApplication.cs
+++ b/src/Discord.Net.Rest/Entities/RestApplication.cs
@@ -34,9 +34,12 @@ namespace Discord.Rest
             Description = model.Description;
             RPCOrigins = model.RPCOrigins;
             Name = model.Name;
-            Flags = model.Flags;
-            Owner = RestUser.Create(Discord, model.Owner);
             _iconId = model.Icon;
+
+            if (model.Flags.IsSpecified)
+                Flags = model.Flags.Value; //TODO: Do we still need this?
+            if (model.Owner.IsSpecified)
+                Owner = RestUser.Create(Discord, model.Owner.Value);
         }
 
         public async Task UpdateAsync()
diff --git a/src/Discord.Net.Rpc/API/Rpc/Application.cs b/src/Discord.Net.Rpc/API/Rpc/Application.cs
deleted file mode 100644
index 6cc12a28b..000000000
--- a/src/Discord.Net.Rpc/API/Rpc/Application.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma warning disable CS1591
-using Newtonsoft.Json;
-
-namespace Discord.API.Rpc
-{
-    public class Application
-    {
-        [JsonProperty("description")]
-        public string Description { get; set; }
-        [JsonProperty("icon")]
-        public string Icon { get; set; }
-        [JsonProperty("id")]
-        public ulong Id { get; set; }
-        [JsonProperty("rpc_origins")]
-        public string[] RpcOrigins { get; set; }
-        [JsonProperty("name")]
-        public string Name { get; set; }
-    }
-}