diff --git a/commerce_recurring.rules.inc b/commerce_recurring.rules.inc
index 5fe21bf..f1f4baf 100644
--- a/commerce_recurring.rules.inc
+++ b/commerce_recurring.rules.inc
@@ -416,10 +416,12 @@ function commerce_recurring_rules_provide_order_properties($recurring_entity) {
   // Provide a default way to copy customer profiles to the new order.
   $profile_fields  = commerce_info_fields('commerce_customer_profile_reference', 'commerce_order');
   foreach ($profile_fields as $name => $field) {
-    // @TODO: The recurring order might be from a different order bundle.
-    if ($instance = field_info_instance('commerce_order', $name, 'commerce_order')) {
+    if ($instance = field_info_instance('commerce_order', $name, $commerce_order->type)) {
       $return[$name] = $commerce_order->{$name};
     }
+    else {
+      $return[$name] = array();
+    }
   }
 
   return $return;