diff --git a/CryptoExchange.Net/SharedApis/ResponseModels/SharedFuturesOrder.cs b/CryptoExchange.Net/SharedApis/ResponseModels/SharedFuturesOrder.cs
index e2e8e9cd..49daa0e5 100644
--- a/CryptoExchange.Net/SharedApis/ResponseModels/SharedFuturesOrder.cs
+++ b/CryptoExchange.Net/SharedApis/ResponseModels/SharedFuturesOrder.cs
@@ -54,10 +54,18 @@ namespace CryptoExchange.Net.SharedApis
         /// Order price
         /// </summary>
         public decimal? OrderPrice { get; set; }
+        private decimal? _averagePrice;
         /// <summary>
-        /// Average price
+        /// Average fill price
         /// </summary>
-        public decimal? AveragePrice { get; set; }
+        public decimal? AveragePrice
+        {
+            get => _averagePrice > 0 ? _averagePrice
+                : (QuantityFilled?.QuantityInBaseAsset > 0 && QuantityFilled?.QuantityInQuoteAsset > 0
+                    ? QuantityFilled.QuantityInQuoteAsset / QuantityFilled.QuantityInBaseAsset
+                    : null);
+            set => _averagePrice = value;
+        }
         /// <summary>
         /// Client order id
         /// </summary>
diff --git a/CryptoExchange.Net/SharedApis/ResponseModels/SharedSpotOrder.cs b/CryptoExchange.Net/SharedApis/ResponseModels/SharedSpotOrder.cs
index afb41850..0535922f 100644
--- a/CryptoExchange.Net/SharedApis/ResponseModels/SharedSpotOrder.cs
+++ b/CryptoExchange.Net/SharedApis/ResponseModels/SharedSpotOrder.cs
@@ -46,10 +46,18 @@ namespace CryptoExchange.Net.SharedApis
         /// Order price
         /// </summary>
         public decimal? OrderPrice { get; set; }
+        private decimal? _averagePrice;
         /// <summary>
         /// Average fill price
         /// </summary>
-        public decimal? AveragePrice { get; set; }
+        public decimal? AveragePrice
+        {
+            get => _averagePrice > 0 ? _averagePrice 
+                : (QuantityFilled?.QuantityInBaseAsset > 0 && QuantityFilled?.QuantityInQuoteAsset > 0 
+                    ? QuantityFilled.QuantityInQuoteAsset / QuantityFilled.QuantityInBaseAsset 
+                    : null);
+            set => _averagePrice = value;
+        }
         /// <summary>
         /// Client order id
         /// </summary>