diff --git a/app/server_app_adapters.go b/app/server_app_adapters.go
index 91e251873a..758bdf94f2 100644
--- a/app/server_app_adapters.go
+++ b/app/server_app_adapters.go
@@ -56,6 +56,8 @@ func (s *Server) RunOldAppInitialization() error {
 
 	mlog.Info("Server is initializing...")
 
+	s.initEnterprise()
+
 	if s.FakeApp().Srv().newStore == nil {
 		s.FakeApp().Srv().newStore = func() store.Store {
 			return store.NewTimerLayer(
@@ -75,8 +77,6 @@ func (s *Server) RunOldAppInitialization() error {
 	s.FakeApp().Srv().Store = s.FakeApp().Srv().newStore()
 	s.FakeApp().StartPushNotificationsHubWorkers()
 
-	s.initEnterprise()
-
 	if err := s.FakeApp().ensureAsymmetricSigningKey(); err != nil {
 		return errors.Wrapf(err, "unable to ensure asymmetric signing key")
 	}