diff --git a/src/ic/ics.js b/src/ic/ics.js
index 7452fa8..a33e1ac 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -101,7 +101,7 @@ class InfrastructureComponents extends Component {
       services: services,
       equipment: equipment,
       numberOfExternalICs,
-      modalIC: {},
+      modalIC: prevState.modalIC || {},
       deleteModal: false,
       icModal: false,
       selectedICs: prevState.selectedICs || [],
@@ -187,13 +187,9 @@ class InfrastructureComponents extends Component {
   }
 
   closeEditModal(data) {
-    this.setState({ editModal : false });
+    this.setState({ editModal : false, modalIC: {} });
 
     if (data) {
-      //let ic = this.state.ics[this.state.modalIndex];
-      //ic = data;
-      //this.setState({ ic: ic });
-
       AppDispatcher.dispatch({
         type: 'ics/start-edit',
         data: data,
@@ -204,8 +200,6 @@ class InfrastructureComponents extends Component {
 
 
   closeDeleteModal(confirmDelete){
-    this.setState({ deleteModal: false });
-
     if (confirmDelete === false) {
       return;
     }
@@ -215,6 +209,8 @@ class InfrastructureComponents extends Component {
       data: this.state.modalIC,
       token: this.state.sessionToken,
     });
+
+    this.setState({ deleteModal: false, modalIC: {} });
   }
 
   exportIC(index) {