diff --git a/app/src/components/IntentForm.js b/app/src/components/IntentForm.js
index 0affcfd..8ebbb4a 100644
--- a/app/src/components/IntentForm.js
+++ b/app/src/components/IntentForm.js
@@ -34,6 +34,14 @@ class IntentForm extends Component {
     this.handleSnackbarClick = this.handleSnackbarClick.bind(this)
   }
 
+  checkFields() {
+    if(this.props.content.length<=1) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   handleDelete(intent_index) {
     if (this.props.content.length > 1) {
       this.props.deleteIntentContent(intent_index);
@@ -79,7 +87,7 @@ class IntentForm extends Component {
                 />
               </Grid>
               <Grid item xs={1}>
-                <IconButton color="primary" m={0} tabIndex={-1} onClick={() => this.handleDelete(sample_index)}>
+                <IconButton color="primary" m={0} tabIndex={-1} disabled={this.checkFields()} onClick={() => this.handleDelete(sample_index)}>
                   <DeleteIcon style={{ opacity: 0.5 }} />
                 </IconButton>
               </Grid>
diff --git a/app/src/components/ToolbarName.js b/app/src/components/ToolbarName.js
index 3ccb835..bed148a 100644
--- a/app/src/components/ToolbarName.js
+++ b/app/src/components/ToolbarName.js
@@ -69,7 +69,21 @@ export default class ToolbarName extends Component {
     }
 
     handleClick() {
-        this.props.saveData(this.props.item);
+        let realContent = [];
+        let newIntent = this.props.item;
+
+        if (this.props.item.samples !== undefined) {
+            this.props.item.samples.forEach(content => {
+                if (content.trim().length !== 0) { 
+                  realContent.push(content);
+                }
+            });
+            newIntent.samples = realContent;
+            this.props.saveData(newIntent);
+        } else {
+            this.props.saveData(this.props.item);
+        }
+        //console.log("Formatado:", newIntent);
     }
 
     handleDelete() {
diff --git a/app/src/ducks/intents.js b/app/src/ducks/intents.js
index 1eb3ed0..0a3a29a 100644
--- a/app/src/ducks/intents.js
+++ b/app/src/ducks/intents.js
@@ -59,6 +59,7 @@ export const undoDeleteIntentContent = (state = INITIAL_STATE) => {
 export const selectIntent = (state = INITIAL_STATE, action) => {
     let selected_item = action.item;
     let selected_item_position = action.item_position;
+    let nonEmptySamples=[];
     
     if (selected_item_position < 0) {
         state.intents.find((item, index) => {
@@ -67,6 +68,14 @@ export const selectIntent = (state = INITIAL_STATE, action) => {
         });
     }
 
+    selected_item.samples.forEach(sample => {
+        if (sample.trim().length !== 0) { 
+          nonEmptySamples.push(sample);
+        } 
+    });
+
+    selected_item.samples=nonEmptySamples;
+
     return {
         ...state,
         id: selected_item.id,
diff --git a/app/src/ducks/utters.js b/app/src/ducks/utters.js
index 1799a34..d339a78 100644
--- a/app/src/ducks/utters.js
+++ b/app/src/ducks/utters.js
@@ -82,6 +82,16 @@ export const selectUtter = (state = INITIAL_STATE, action) => {
         });
     }
 
+    
+    for (let i=0; i< selected_item.alternatives[0].length; i++) {
+        if (selected_item.alternatives[0][i].trim().length === 0){
+            selected_item.alternatives[0].splice(i, 1);
+            console.log("ACERTOU!: ", selected_item.alternatives[0]);
+        };
+    }
+
+
+
     return {
         ...state,
         helper_text: "",
diff --git a/app/src/pages/IntentPage.js b/app/src/pages/IntentPage.js
index 28517f0..12e61c7 100644
--- a/app/src/pages/IntentPage.js
+++ b/app/src/pages/IntentPage.js
@@ -46,15 +46,25 @@ class IntentPage extends Component {
   }
 
   checkEmptyFieldsIntent(samples) {
-    let changed = true;
+    let status = true;
+    let emptyField = false;
+    let fullfilledIntents = 0;
     if (samples !== undefined) {
       samples.forEach(sample => {
-        if (sample.trim().length === 0) {
-          changed = false;
+        if (sample.trim().length === 0) { 
+          emptyField = true;
+        } else {
+          fullfilledIntents++;
         }
       });
+
+      if (fullfilledIntents === 0 && emptyField) {
+        status = false;
+      } else {
+        status = true;
+      }
     }
-    return changed;
+    return status;
   }
 
   isButtonEnabled() {
diff --git a/app/src/utils/url_routes.js b/app/src/utils/url_routes.js
index 03a9634..362e71e 100644
--- a/app/src/utils/url_routes.js
+++ b/app/src/utils/url_routes.js
@@ -1,4 +1,4 @@
-export const BASE = process.env.REACT_APP_URL_API + 'api/v1/';
+export const BASE = 'http://localhost:8000/api/v1/'; 
 export const ITEMS_BASE = BASE + 'projects/1/';
 
 export const UTTER_URL = ITEMS_BASE + "utters/";
diff --git a/docker-compose.yml b/docker-compose.yml
index f323075..bf71d1e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     ports:
       - 3000:3000
     environment:
-       REACT_APP_URL_API: http://localhost:8000/ # API 
+       REACT_APP_URL_API: http://localhost:8000/ #API
     stdin_open: true
     volumes:
       - ./app:/botflow/