diff --git a/schema/cadence/versioned/v0.5/manifest.json b/schema/cadence/versioned/v0.5/manifest.json
index dffacb24f05..b521ce71ceb 100644
--- a/schema/cadence/versioned/v0.5/manifest.json
+++ b/schema/cadence/versioned/v0.5/manifest.json
@@ -3,6 +3,7 @@
   "MinCompatibleVersion": "0.5",
   "Description": "add cross DC domain replication config, add target child workflow only to transfer task, add cross DC domain config verion, as a sequency ID to prevent out of order domain update, add flag indicating whether a domain is a global domain",
   "SchemaUpdateCqlFiles": [
+    "add_domain_config_version.cql",
     "add_replication_config.cql",
     "add_target_child_workflow_only_to_transfer_task.cql"
   ]
diff --git a/service/frontend/service.go b/service/frontend/service.go
index 6fef2a8d377..182e12830ff 100644
--- a/service/frontend/service.go
+++ b/service/frontend/service.go
@@ -22,6 +22,8 @@ package frontend
 
 import (
 	"github.com/uber/cadence/common"
+	"github.com/uber/cadence/common/messaging"
+	"github.com/uber/cadence/common/mocks"
 	"github.com/uber/cadence/common/persistence"
 	"github.com/uber/cadence/common/service"
 )
@@ -114,9 +116,15 @@ func (s *Service) Start() {
 
 	history = persistence.NewHistoryPersistenceClient(history, base.GetMetricsClient())
 
-	kafkaProducer, err := base.GetMessagingClient().NewProducer(base.GetClusterMetadata().GetCurrentClusterName())
-	if err != nil {
-		log.Fatalf("Creating kafka producer failed: %v", err)
+	// TODO when global domain is enabled, uncomment the line below and remove the line after
+	var kafkaProducer messaging.Producer
+	if base.GetClusterMetadata().IsGlobalDomainEnabled() {
+		kafkaProducer, err = base.GetMessagingClient().NewProducer(base.GetClusterMetadata().GetCurrentClusterName())
+		if err != nil {
+			log.Fatalf("Creating kafka producer failed: %v", err)
+		}
+	} else {
+		kafkaProducer = &mocks.KafkaProducer{}
 	}
 
 	handler := NewWorkflowHandler(base, s.config, metadata, history, visibility, kafkaProducer)