diff --git a/.eslintrc.es5.json b/.eslintrc.es5.json
index 51e2286deb..e13ffd91c0 100644
--- a/.eslintrc.es5.json
+++ b/.eslintrc.es5.json
@@ -36,7 +36,6 @@
     "array-bracket-spacing": 0,
     "default-case": 0,
     "no-lonely-if": 0,
-    "space-before-blocks": 0,
     "no-mixed-operators": 0,
     "eqeqeq": 0,
     "space-in-parens": 0,
diff --git a/assets/js/src/analytics_event.js b/assets/js/src/analytics_event.js
index aef83218de..63d5f4e18c 100644
--- a/assets/js/src/analytics_event.js
+++ b/assets/js/src/analytics_event.js
@@ -17,7 +17,7 @@
  */
 var eventsCache = [];
 
-function track(name, data){
+function track(name, data) {
   if (typeof window.mixpanel.track !== 'function') {
     window.mixpanel.init(window.mixpanelTrackingId);
   }
diff --git a/assets/js/src/date.js b/assets/js/src/date.js
index e335415391..a709ec2758 100644
--- a/assets/js/src/date.js
+++ b/assets/js/src/date.js
@@ -145,7 +145,7 @@ define('date',
         var convertedFormat = [];
         var escapeToken = false;
 
-        for(var index = 0, token = ''; format.charAt(index); index += 1){
+        for(var index = 0, token = ''; format.charAt(index); index += 1) {
           token = format.charAt(index);
           if (escapeToken === true) {
             convertedFormat.push('['+token+']');
diff --git a/assets/js/src/form_editor/form_editor.js b/assets/js/src/form_editor/form_editor.js
index 17930389bf..528e23ce99 100644
--- a/assets/js/src/form_editor/form_editor.js
+++ b/assets/js/src/form_editor/form_editor.js
@@ -917,7 +917,7 @@ WysijaForm.Block.create = function (createBlock, target) {
   if(block.type === 'segment') {
     if(block.params.values === undefined) {
       var settings_segments = window.jQuery('#mailpoet_form_segments').val();
-      if(settings_segments !== null && settings_segments.length > 0){
+      if(settings_segments !== null && settings_segments.length > 0) {
         block.params.values = window.mailpoet_segments.filter(function (segment) {
           return (settings_segments.indexOf(segment.id) !== -1);
         });
diff --git a/assets/js/src/jquery.serialize_object.js b/assets/js/src/jquery.serialize_object.js
index 990f4318f3..bd1583835a 100644
--- a/assets/js/src/jquery.serialize_object.js
+++ b/assets/js/src/jquery.serialize_object.js
@@ -28,7 +28,7 @@ define(
         coerce_types = { true: !0, false: !1, null: null };
 
       // Iterate over all name=value pairs.
-      $.each( this.serializeArray(), function (j, v){
+      $.each( this.serializeArray(), function (j, v) {
         var key = v.name,
           val = v.value,
           cur = obj,
diff --git a/assets/js/src/modal.js b/assets/js/src/modal.js
index 3af411f645..3b84df8708 100644
--- a/assets/js/src/modal.js
+++ b/assets/js/src/modal.js
@@ -626,7 +626,7 @@ define('modal', ['mailpoet', 'jquery'],
         this.destroy();
 
           // restore the previously focused element
-        if(this.prevFocus !== undefined){
+        if(this.prevFocus !== undefined) {
           this.prevFocus.focus();
         }
 
diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js
index b88584adfa..f7f4f0af08 100644
--- a/assets/js/src/newsletter_editor/blocks/posts.js
+++ b/assets/js/src/newsletter_editor/blocks/posts.js
@@ -300,7 +300,7 @@ define([
     },
     onPostsScroll: function (event) {
       var $postsBox = jQuery(event.target);
-      if($postsBox.scrollTop() + $postsBox.innerHeight() >= $postsBox[0].scrollHeight){
+      if($postsBox.scrollTop() + $postsBox.innerHeight() >= $postsBox[0].scrollHeight) {
         // Load more posts if scrolled to bottom
         this.blockModel.trigger('loadMorePosts');
       }