diff --git a/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts b/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts
index 143c3c5..54497ba 100644
--- a/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts
+++ b/catalog-ui/src/app/utils/change-lifecycle-state-handler.ts
@@ -103,14 +103,15 @@
             //-------------------------------------------------
             let onOk = (confirmationText):void => {
                 comment.userRemarks = confirmationText;
-                scope.isLoading = true;
 
                 if (data.url === "lifecycleState/CHECKIN") {
                     this.eventBusService.notify("CHECK_IN").subscribe(() => {
+                        scope.isLoading = true;
                         component.changeLifecycleState(data.url, comment).then(onSuccess, onError);
                     });
                 }
                 else {
+                    scope.isLoading = true;
                     component.changeLifecycleState(data.url, comment).then(onSuccess, onError);
                 }
             };