diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index 11fe07a..4035a92 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -922,12 +922,16 @@ function fieldable_panels_panes_entity_edit_form_submit($form, &$form_state) {
   $entity->title = $form_state['values']['title'];
   $entity->link = $form_state['values']['link'];
   $entity->path = $form_state['values']['path'];
-  $entity->language = $form_state['values']['language'];
   $entity->reusable = $form_state['values']['reusable'];
   $entity->category = $form_state['values']['category'];
   $entity->admin_title = $form_state['values']['admin_title'];
   $entity->admin_description = $form_state['values']['admin_description'];
 
+  // Only applicable when using entity_translation module.
+  if (!empty($form_state['values']['language'])) {
+    $entity->language = $form_state['values']['language'];
+  }
+
   $entity->revision = $form_state['values']['revision'];
   // Only set a log message if there was a new revision. This prevents
   // overwriting a log message on the current revision