diff --git a/commerce_flat_rate.install b/commerce_flat_rate.install
index b084772..afa5923 100644
--- a/commerce_flat_rate.install
+++ b/commerce_flat_rate.install
@@ -73,3 +73,17 @@ function commerce_flat_rate_schema() {
 
   return $schema;
 }
+
+/**
+ * Fix any flat rate services that did not have a data array by adding the data
+ * array to them.
+ */
+function commerce_flat_rate_update_7000() {
+  $shipping_services = commerce_shipping_services('flat_rate');
+  foreach ($shipping_services as $service) {
+    if ($service['module'] == 'commerce_flat_rate' && !is_array($service['data'])) {
+      $service['data'] = array();
+      commerce_flat_rate_service_save($service);
+    }
+  }
+}
diff --git a/commerce_flat_rate.module b/commerce_flat_rate.module
index 172236e..4f4e111 100644
--- a/commerce_flat_rate.module
+++ b/commerce_flat_rate.module
@@ -167,6 +167,7 @@ function commerce_flat_rate_service_new() {
       'currency_code' => commerce_default_currency(),
       'data' => array(),
     ),
+    'data' => array(),
     'is_new' => TRUE,
   );
 }