diff --git a/src/server/.eslintrc b/src/server/.eslintrc
index 5165c488..2ac0718b 100644
--- a/src/server/.eslintrc
+++ b/src/server/.eslintrc
@@ -1,4 +1,4 @@
-  {
+{
   "root": true,
 
   "parser": "babel-eslint",
@@ -179,5 +179,12 @@
     "arrow-spacing": [2,{"before":true,"after":true}],
     "no-const-assign": 2,
     "no-var": 2
-  }
+  },
+
+  "overrides": [
+	{
+	  "files": ["**/clientComponents/**/*.js"],
+	  "extends": "../client/.eslintrc"
+	}
+  ]
 }
diff --git a/src/server/clientComponents/.eslintrc b/src/server/clientComponents/.eslintrc
deleted file mode 100644
index 7658189f..00000000
--- a/src/server/clientComponents/.eslintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"extends": "../../client/.eslintrc"
-}
\ No newline at end of file