diff --git a/src/CSSTransition.js b/src/CSSTransition.js
index 4f0a2317..20023c73 100644
--- a/src/CSSTransition.js
+++ b/src/CSSTransition.js
@@ -4,6 +4,8 @@ import addOneClass from 'dom-helpers/addClass';
 import removeOneClass from 'dom-helpers/removeClass';
 import React from 'react';
 
+import config from './config';
+
 import Transition from './Transition';
 import { classNamesShape } from './utils/PropTypes';
 
@@ -108,6 +110,10 @@ class CSSTransition extends React.Component {
     this.removeClasses(node, type);
     this.addClass(node, type, 'done');
 
+    if (config.disabled) {
+      this.removeClasses(node, 'exit');
+    }
+
     if (this.props.onEntered) {
       this.props.onEntered(node, appearing)
     }
@@ -135,6 +141,10 @@ class CSSTransition extends React.Component {
     this.removeClasses(node, 'exit');
     this.addClass(node, 'exit', 'done');
 
+    if (config.disabled) {
+      this.removeClasses(node, 'enter');
+    }
+
     if (this.props.onExited) {
       this.props.onExited(node)
     }