diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json
index bd79ceaa2d..6ef236fb86 100644
--- a/.eslintrc.es6.json
+++ b/.eslintrc.es6.json
@@ -31,7 +31,6 @@
     "react/jsx-boolean-value": 0,
     "react/jsx-no-bind": 0,
     "react/no-array-index-key": 0,
-    "object-shorthand": 0,
     "space-unary-ops": 0,
     "space-infix-ops": 0,
     "no-irregular-whitespace": 0
diff --git a/assets/js/src/form/fields/field.jsx b/assets/js/src/form/fields/field.jsx
index a45f6af398..dc145ef7f3 100644
--- a/assets/js/src/form/fields/field.jsx
+++ b/assets/js/src/form/fields/field.jsx
@@ -94,7 +94,7 @@ define([
 
       if (this.props.field.fields !== undefined) {
         field = this.props.field.fields.map((subfield, index) => this.renderField({
-          index: index,
+          index,
           field: subfield,
           item: this.props.item,
           onValueChange: this.props.onValueChange || false,
diff --git a/assets/js/src/form/form.jsx b/assets/js/src/form/form.jsx
index 7f3278f651..01f9d516ca 100644
--- a/assets/js/src/form/form.jsx
+++ b/assets/js/src/form/form.jsx
@@ -71,7 +71,7 @@ define(
           endpoint: this.props.endpoint,
           action: 'get',
           data: {
-            id: id,
+            id,
           },
         }).done((response) => {
           this.setState({
@@ -153,7 +153,7 @@ define(
         item[field] = e.target.value;
 
         this.setState({
-          item: item,
+          item,
         });
         return true;
       },
diff --git a/assets/js/src/listing/listing.jsx b/assets/js/src/listing/listing.jsx
index 960f78e4bb..1576e67d37 100644
--- a/assets/js/src/listing/listing.jsx
+++ b/assets/js/src/listing/listing.jsx
@@ -516,7 +516,7 @@ const Listing = React.createClass({
       endpoint: this.props.endpoint,
       action: 'restore',
       data: {
-        id: id,
+        id,
       },
     }).done((response) => {
       if (
@@ -544,7 +544,7 @@ const Listing = React.createClass({
       endpoint: this.props.endpoint,
       action: 'trash',
       data: {
-        id: id,
+        id,
       },
     }).done((response) => {
       if (
@@ -572,7 +572,7 @@ const Listing = React.createClass({
       endpoint: this.props.endpoint,
       action: 'delete',
       data: {
-        id: id,
+        id,
       },
     }).done((response) => {
       if (
@@ -637,7 +637,7 @@ const Listing = React.createClass({
       api_version: window.mailpoet_api_version,
       endpoint: this.props.endpoint,
       action: 'bulkAction',
-      data: data,
+      data,
     }).done(() => {
       this.getItems();
     }).fail((response) => {
@@ -651,7 +651,7 @@ const Listing = React.createClass({
   },
   handleSearch: function handleSearch(search) {
     this.setState({
-      search: search,
+      search,
       page: 1,
       selection: false,
       selected_ids: [],
@@ -684,7 +684,7 @@ const Listing = React.createClass({
     }
 
     this.setState({
-      selection: selection,
+      selection,
       selected_ids: selectedIds,
     });
   },
@@ -729,7 +729,7 @@ const Listing = React.createClass({
     jQuery('#search_input').val('');
 
     this.setState({
-      group: group,
+      group,
       filter: {},
       search: '',
       page: 1,
@@ -739,7 +739,7 @@ const Listing = React.createClass({
   },
   handleSetPage: function handleSetPage(page) {
     this.setState({
-      page: page,
+      page,
       selection: false,
       selected_ids: [],
     }, () => {
diff --git a/assets/js/src/newsletters/breadcrumb.jsx b/assets/js/src/newsletters/breadcrumb.jsx
index 80eefb2220..9d7bd517b4 100644
--- a/assets/js/src/newsletters/breadcrumb.jsx
+++ b/assets/js/src/newsletters/breadcrumb.jsx
@@ -36,7 +36,7 @@ define(
         ];
         return {
           step: null,
-          steps: steps,
+          steps,
         };
       },
       render: function render() {
diff --git a/assets/js/src/newsletters/newsletters.jsx b/assets/js/src/newsletters/newsletters.jsx
index fd45017e40..3c9c048240 100644
--- a/assets/js/src/newsletters/newsletters.jsx
+++ b/assets/js/src/newsletters/newsletters.jsx
@@ -34,7 +34,7 @@ const getAutomaticEmailsRoutes = () => {
     name: automaticEmail.slug,
     component: AutomaticEmailEventsList,
     data: {
-      automaticEmail: automaticEmail,
+      automaticEmail,
     },
   }));
 };
diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index 0879096088..a6ac942dea 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -73,7 +73,7 @@ define(
           endpoint: 'newsletters',
           action: 'get',
           data: {
-            id: id,
+            id,
           },
         }).done((response) => {
           this.setState({
@@ -101,7 +101,7 @@ define(
                 newsletter_id: response.data.id,
                 name: response.data.subject,
                 description: response.data.preheader,
-                thumbnail: thumbnail,
+                thumbnail,
                 body: JSON.stringify(response.data.body),
                 categories: '["recent"]',
               },
@@ -309,7 +309,7 @@ define(
         item[field] = e.target.value;
 
         this.setState({
-          item: item,
+          item,
         });
         return true;
       },
diff --git a/assets/js/src/newsletters/send/standard.jsx b/assets/js/src/newsletters/send/standard.jsx
index a1d2f45b18..880dd892f9 100644
--- a/assets/js/src/newsletters/send/standard.jsx
+++ b/assets/js/src/newsletters/send/standard.jsx
@@ -102,13 +102,13 @@ define(
             // Transform string format to Date object
             return MailPoet.Date.toDate(value, {
               parseFormat: dateDisplayFormat,
-              format: format,
+              format,
             });
           };
           jQuery.datepicker.formatDate = function formatDate(format, value) {
             // Transform Date object to string format
             const newValue = MailPoet.Date.format(value, {
-              format: format,
+              format,
             });
             return newValue;
           };
@@ -120,7 +120,7 @@ define(
               that.onChange({
                 target: {
                   name: that.getFieldName(),
-                  value: value,
+                  value,
                 },
               });
             },
@@ -205,8 +205,8 @@ define(
         const value = props.value || defaultDateTime;
         const [date, time] = value.split(this.DATE_TIME_SEPARATOR);
         return {
-          date: date,
-          time: time,
+          date,
+          time,
         };
       },
       handleChange: function handleChange(event) {
diff --git a/assets/js/src/newsletters/templates.jsx b/assets/js/src/newsletters/templates.jsx
index 1294e775be..8980a9e8bf 100644
--- a/assets/js/src/newsletters/templates.jsx
+++ b/assets/js/src/newsletters/templates.jsx
@@ -144,7 +144,7 @@ class NewsletterTemplates extends React.Component {
     }).always(() => {
       this.setState({
         templates: this.templates,
-        selectedTab: selectedTab,
+        selectedTab,
         loading: false,
       });
     });
diff --git a/assets/js/src/newsletters/templates/template_box.jsx b/assets/js/src/newsletters/templates/template_box.jsx
index c338a354f2..55ee9f2926 100644
--- a/assets/js/src/newsletters/templates/template_box.jsx
+++ b/assets/js/src/newsletters/templates/template_box.jsx
@@ -25,7 +25,7 @@ class TemplateBox extends React.Component {
         endpoint: 'newsletterTemplates',
         action: 'delete',
         data: {
-          id: id,
+          id,
         },
       }).done(() => {
         afterDelete(true, id);
@@ -44,7 +44,7 @@ class TemplateBox extends React.Component {
       message: MailPoet.I18n.t('confirmTemplateDeletion').replace('%$1s', name),
       confirmLabel: MailPoet.I18n.t('confirmLabel'),
       cancelLabel: MailPoet.I18n.t('cancelLabel'),
-      onConfirm: onConfirm,
+      onConfirm,
       onCancel: () => {},
     });
   }
@@ -78,7 +78,7 @@ class TemplateBox extends React.Component {
       action: 'save',
       data: {
         id: newsletterId,
-        body: body,
+        body,
       },
     }).done((response) => {
       afterSelect(true, response.data.id);
diff --git a/assets/js/src/newsletters/types.jsx b/assets/js/src/newsletters/types.jsx
index e022871445..87c55aa51c 100644
--- a/assets/js/src/newsletters/types.jsx
+++ b/assets/js/src/newsletters/types.jsx
@@ -38,7 +38,7 @@ define(
           endpoint: 'newsletters',
           action: 'create',
           data: {
-            type: type,
+            type,
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
           },
         }).done((response) => {
diff --git a/assets/js/src/newsletters/types/woocommerce.jsx b/assets/js/src/newsletters/types/woocommerce.jsx
index 57b6c5f451..10df5fd92b 100644
--- a/assets/js/src/newsletters/types/woocommerce.jsx
+++ b/assets/js/src/newsletters/types/woocommerce.jsx
@@ -36,7 +36,7 @@ define(
           endpoint: 'newsletters',
           action: 'create',
           data: {
-            type: type,
+            type,
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
           },
         }).done((response) => {