diff --git a/app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee
index f20cdbb092..16d133059e 100644
--- a/app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee
+++ b/app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee
@@ -13,8 +13,10 @@ angular.module("admin.subscriptions").controller "OrdersPanelController", ($scop
     OrderCycles.byID[id].name
 
   $scope.orderCycleCloses = (id) ->
-    closes_at = moment(OrderCycles.byID[id].orders_close_at)
-    text = if closes_at > moment() then t('js.closes') else t('js.closed')
+    oc = OrderCycles.byID[id]
+    return t('js.subscriptions.close_date_not_set') unless oc?.orders_close_at?
+    closes_at = moment(oc.orders_close_at)
+    text = if closes_at > moment() then t('js.subscriptions.closes') else t('js.subscription.closed')
     "#{text} #{closes_at.fromNow()}"
 
   $scope.stateText = (state) -> t("spree.order_state.#{state}")
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 70bc185a93..71e11de4be 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2208,8 +2208,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     choose: Choose
     resolve_errors: Please resolve the following errors
     more_items: "+ %{count} More"
-    closes: closes
-    closed: closed
     admin:
       enterprise_limit_reached: "You have reached the standard limit of enterprises per account. Write to %{contact_email} if you need to increase it."
       modals:
@@ -2371,6 +2369,10 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     customers:
       select_shop: 'Please select a shop first'
       could_not_create: Sorry! Could not create
+    subscriptions:
+      closes: closes
+      closed: closed
+      close_date_not_set: Close date not set
   producers:
     signup:
       start_free_profile: "Start with a free profile, and expand when you're ready!"