diff --git a/htdocs/sites/all/modules/contrib/commerce_recurring/commerce_recurring.rules.inc b/htdocs/sites/all/modules/contrib/commerce_recurring/commerce_recurring.rules.inc
index fed3d98..4d4f212 100644
--- a/htdocs/sites/all/modules/contrib/commerce_recurring/commerce_recurring.rules.inc
+++ b/htdocs/sites/all/modules/contrib/commerce_recurring/commerce_recurring.rules.inc
@@ -431,10 +431,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;
@@ -504,8 +506,13 @@ function commerce_recurring_rules_generate_order_from_recurring() {
     return;
   }
 
+  // Get the type of the first order
+  /** @var EntityListWrapper $orders */
+  $orders = $recurring_wrapper->commerce_recurring_order;
+  $order_type = $orders->get(0)->type->value();
+
   // Generate a new order with that product.
-  $order = commerce_order_new($recurring_entity->uid, 'recurring_pending');
+  $order = commerce_order_new($recurring_entity->uid, 'recurring_pending', $order_type);
   $order->log = t('Created from recurring entity.');
   // Add the recurring entity id to the data array from the order to keep track.
   $order->data['recurring_entity'] = $recurring_entity->id;