diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/OrderDetails/dydxOrderDetailsViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/OrderDetails/dydxOrderDetailsViewBuilder.swift
index 5ed69e157..e8ba1465d 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/OrderDetails/dydxOrderDetailsViewBuilder.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/OrderDetails/dydxOrderDetailsViewBuilder.swift
@@ -138,16 +138,18 @@ private class dydxOrderDetailsViewPresenter: HostedViewPresenter<dydxOrderDetail
             } else {
                 itemValue = .none
             }
-            return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.GENERAL.CREATED_AT"),
-                                                  value: itemValue)
+            return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.GENERAL.CREATED_AT"), value: itemValue)
         }
 
         var goodTil: dydxOrderDetailsViewModel.Item? {
-            if order.timeInForce == .gtt,
-               let expiresAtMilliseconds = order.expiresAtMilliseconds?.doubleValue {
-                let text = dydxFormatter.shared.dateAndTime(date: Date(milliseconds: expiresAtMilliseconds))
-                return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.TRADE.GOOD_TIL_TIME"),
-                                                      value: .string(text))
+            if order.timeInForce == .gtt {
+                let itemValue: dydxOrderDetailsViewModel.Item.ItemValue?
+                if let createdAtMilliseconds = order.expiresAtMilliseconds?.doubleValue {
+                    itemValue = .string(dydxFormatter.shared.dateAndTime(date: Date(milliseconds: createdAtMilliseconds)))
+                } else {
+                    itemValue = .none
+                }
+                return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.TRADE.GOOD_TIL_TIME"), value: itemValue)
             }
             return nil
         }