diff --git a/src/TableHeader.js b/src/TableHeader.js
index 9f82a25..ee12a21 100644
--- a/src/TableHeader.js
+++ b/src/TableHeader.js
@@ -88,8 +88,12 @@ class TableHeader extends Component {
 
 
   componentWillUnmount(){
+    if (this.props.draggable){
       this.removeDragAbleEvent();
+    }
+    if(this.props.dragborder){
       this.removeDragBorderEvent();
+    }
   }
 
   // componentDidMount(){