diff --git a/web/modules/custom/yufu_admin/yufu_admin.module b/web/modules/custom/yufu_admin/yufu_admin.module
index fe38e69..f2c03e6 100644
--- a/web/modules/custom/yufu_admin/yufu_admin.module
+++ b/web/modules/custom/yufu_admin/yufu_admin.module
@@ -104,6 +104,11 @@ function _yufu_admin_get_node_transition(NodeInterface $node) {
   $original = $node->original ?? NULL;
   $moderation_state = $node->moderation_state->value;
   $previous_state = $original?->moderation_state->value ?? NULL;
+
+  if ($node->field_strojni_prevod->value) {
+    return;
+  }
+
   if ($moderation_state == 'draft' && in_array($previous_state, ['published', NULL])) {
     return 'concept_drafted';
   }
diff --git a/web/modules/custom/yufu_concept/yufu_concept.module b/web/modules/custom/yufu_concept/yufu_concept.module
index 758cc57..a556517 100644
--- a/web/modules/custom/yufu_concept/yufu_concept.module
+++ b/web/modules/custom/yufu_concept/yufu_concept.module
@@ -95,9 +95,8 @@ function uskladi_prevode(EntityInterface $entity) {
     $entityRepository = \Drupal::service('entity.repository');
     foreach($ostaliJeziki as $jezik) {
       $prevod = $entityRepository->getTranslationFromContext($entity, $jezik);
-      $strojniPrevodField = $prevod->field_strojni_prevod->first();
-      $strojniPrevod = $strojniPrevodField->value;
-      if ($strojniPrevod != '0') {
+      $strojniPrevod = $prevod->field_strojni_prevod->value;
+      if ($strojniPrevod) {
         prevedi_koncept($entity, $prevod);
         $prevod->save();
       }