diff --git a/module_build_service/models.py b/module_build_service/models.py
index f511c2dc..fbe1fe51 100644
--- a/module_build_service/models.py
+++ b/module_build_service/models.py
@@ -254,7 +254,7 @@ class ModuleBuild(MBSBase):
 
     @classmethod
     def create(cls, session, conf, name, stream, version, modulemd, scmurl, username,
-               copr_owner=None, copr_project=None, rebuild_strategy=None):
+               copr_owner=None, copr_project=None, rebuild_strategy=None, publish_msg=True):
         now = datetime.utcnow()
         module = cls(
             name=name,
@@ -276,12 +276,13 @@ class ModuleBuild(MBSBase):
         module.module_builds_trace.append(mbt)
         session.add(module)
         session.commit()
-        module_build_service.messaging.publish(
-            service='mbs',
-            topic='module.state.change',
-            msg=module.extended_json(),  # Note the state is "init" here...
-            conf=conf,
-        )
+        if publish_msg:
+            module_build_service.messaging.publish(
+                service='mbs',
+                topic='module.state.change',
+                msg=module.extended_json(),  # Note the state is "init" here...
+                conf=conf,
+            )
         return module
 
     def transition(self, conf, state, state_reason=None):
diff --git a/module_build_service/utils.py b/module_build_service/utils.py
index 8447dc41..cd8a723e 100644
--- a/module_build_service/utils.py
+++ b/module_build_service/utils.py
@@ -703,8 +703,10 @@ def load_local_builds(local_build_nsvs, session=None):
             version=str(mmd.version),
             modulemd=mmd.dumps(),
             scmurl="",
-            username="mbs")
+            username="mbs",
+            publish_msg=False)
         module.koji_tag = path
+        module.state = models.BUILD_STATES['done']
         session.commit()
 
         if (found_build[0] != module.name or found_build[1] != module.stream or