diff --git a/ttm/publisher.py b/ttm/publisher.py
index efde23ea..a2eaeb84 100644
--- a/ttm/publisher.py
+++ b/ttm/publisher.py
@@ -176,8 +176,12 @@ class ToTestPublisher(ToTestManager):
 
         group_id = self.openqa_group_id()
 
-        if self.get_status('publishing') == current_snapshot or self.get_status('published') == current_snapshot:
+        if self.get_status('publishing') == current_snapshot:
             self.logger.info('{} is already publishing'.format(current_snapshot))
+            # migrating - if there is no published entry, the last publish call
+            # didn't wait for publish - and as such didn't set published state
+            if self.get_status('published') != current_snapshot:
+                return QAResult.passed
             return None
 
         current_result = self.overall_result(current_snapshot)
diff --git a/ttm/releaser.py b/ttm/releaser.py
index a2d6d290..343ffa73 100644
--- a/ttm/releaser.py
+++ b/ttm/releaser.py
@@ -226,8 +226,11 @@ class ToTestReleaser(ToTestManager):
         # omit snapshot, we don't want to rename on release
         if not self.project.set_snapshot_number:
             snapshot = None
-        release = 'Snapshot%s' % snapshot if snapshot else None
-        self.logger.info('Updating snapshot %s' % snapshot)
+        if snapshot:
+            release = 'Snapshot%s' % snapshot
+            self.logger.info('Updating snapshot %s' % snapshot)
+        else:
+            release = None
         if not (self.dryrun or self.project.do_not_release):
             self.api.switch_flag_in_prj(self.project.test_project, flag='publish', state='disable',
                                         repository=self.project.product_repo)