diff --git a/main.go b/main.go
index f4aa4730d..5dd83951e 100644
--- a/main.go
+++ b/main.go
@@ -27,7 +27,9 @@ func main() {
 			globals.SugarLogger.Errorf("RefreshElmToken failed with error:%s", err)
 			return
 		}
-		controller.InitOrder()
+		if globals.CallLegacyMsgHandler {
+			controller.InitOrder()
+		}
 	}
 	bzcon.LoadPendingOrders()