diff --git a/lib/rules/prefer-es6-class.js b/lib/rules/prefer-es6-class.js
index b61011e69d..0a42f3e2ba 100644
--- a/lib/rules/prefer-es6-class.js
+++ b/lib/rules/prefer-es6-class.js
@@ -11,11 +11,14 @@ var Components = require('../util/Components');
 // ------------------------------------------------------------------------------
 
 module.exports = Components.detect(function(context, components, utils) {
+  var configuration = context.options[0] || 'always';
 
   return {
     ObjectExpression: function(node) {
-      if (utils.isES5Component(node)) {
+      if (utils.isES5Component(node) && configuration === 'always') {
         context.report(node, 'Component should use es6 class instead of createClass');
+      } else if (utils.isES6Component(node) && configuration === 'never') {
+        context.report(node, 'Component should use createClass instead of es6 class');
       }
     }
   };