diff --git a/modules/ticket/front/descriptor/index.html b/modules/ticket/front/descriptor/index.html
index ede553b72..2f0400f6b 100644
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@@ -5,6 +5,7 @@
         <vn-item
             ng-click="addTurn.show()"
             vn-acl="buyer"
+            ng-show="$ctrl.isEditable"
             vn-acl-action="remove"
             name="addTurn"
             translate>
@@ -60,7 +61,7 @@
         </vn-item>
         <vn-item
             ng-click="makeInvoiceConfirmation.show()"
-            ng-show="!$ctrl.isInvoiced"
+            ng-show="$ctrl.isEditable"
             vn-acl="invoicing"
             vn-acl-action="remove"
             name="makeInvoice"
diff --git a/modules/ticket/front/descriptor/index.js b/modules/ticket/front/descriptor/index.js
index d6fe85372..c3f295ba1 100644
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@@ -8,6 +8,7 @@ class Controller extends Descriptor {
 
     set ticket(value) {
         this.entity = value;
+        this.isTicketEditable();
     }
 
     get entity() {
@@ -22,14 +23,6 @@ class Controller extends Descriptor {
             this.showSMSDialog();
     }
 
-    get isEditable() {
-        try {
-            return !this.ticket.tracking.state.alertLevel;
-        } catch (e) {}
-
-        return true;
-    }
-
     get isInvoiced() {
         return this.ticket.refFk !== null;
     }
@@ -45,6 +38,12 @@ class Controller extends Descriptor {
         return this.ticket.stowaway || this.ticket.ship;
     }
 
+    isTicketEditable() {
+        this.$http.get(`Tickets/${this.$state.params.id}/isEditable`).then(res => {
+            this.isEditable = res.data;
+        });
+    }
+
     showChangeShipped() {
         this.newShipped = this.ticket.shipped;
         this.$.changeShippedDialog.show();
diff --git a/modules/ticket/front/descriptor/index.spec.js b/modules/ticket/front/descriptor/index.spec.js
index 41a2cceea..ef032d775 100644
--- a/modules/ticket/front/descriptor/index.spec.js
+++ b/modules/ticket/front/descriptor/index.spec.js
@@ -28,8 +28,10 @@ describe('Ticket Component vnTicketDescriptor', () => {
     beforeEach(angular.mock.inject(($componentController, _$httpBackend_, _$state_) => {
         $httpBackend = _$httpBackend_;
         $httpBackend.whenGET(`Tickets/${ticket.id}/canHaveStowaway`).respond(true);
+        $httpBackend.whenGET(`Tickets/1/isEditable`).respond(true);
 
         $state = _$state_;
+        $state.params.id = 1;
         $state.getCurrentPath = () => [null, {state: {name: 'ticket'}}];
 
         controller = $componentController('vnTicketDescriptor', {$element: null}, {ticket});