diff --git a/images/manageiq-orchestrator/container-assets/entrypoint b/images/manageiq-orchestrator/container-assets/entrypoint
index f9e22768..25493091 100755
--- a/images/manageiq-orchestrator/container-assets/entrypoint
+++ b/images/manageiq-orchestrator/container-assets/entrypoint
@@ -116,7 +116,10 @@ EOS
 
 check_svc_status ${MEMCACHED_SERVICE_HOST} ${MEMCACHED_SERVICE_PORT}
 check_svc_status ${database_hostname} ${database_port}
-check_svc_status ${MESSAGING_HOSTNAME} ${MESSAGING_PORT}
+
+if [ -n "$MESSAGING_HOSTNAME" ] && [ -n "$MESSAGING_PORT" ]; then
+  check_svc_status ${MESSAGING_HOSTNAME} ${MESSAGING_PORT}
+fi
 
 check_deployment_status || exit 1
 
diff --git a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
index cf35645f..7e2aa681 100644
--- a/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
+++ b/manageiq-operator/api/v1alpha1/helpers/miq-components/cr.go
@@ -50,7 +50,11 @@ func databaseVolumeCapacity(cr *miqv1alpha1.ManageIQ) string {
 }
 
 func deployMessagingService(cr *miqv1alpha1.ManageIQ) bool {
-	return true
+	if cr.Spec.DeployMessagingService == nil {
+		return true
+	} else {
+		return *cr.Spec.DeployMessagingService
+	}
 }
 
 func enableApplicationLocalLogin(cr *miqv1alpha1.ManageIQ) bool {