diff --git a/app/opentracing/opentracing_layer.go b/app/opentracing/opentracing_layer.go
index e50746cc98..2e86193b34 100644
--- a/app/opentracing/opentracing_layer.go
+++ b/app/opentracing/opentracing_layer.go
@@ -18057,9 +18057,9 @@ func (a *OpenTracingAppLayer) UserIsFirstAdmin(user *model.User) bool {
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.UserIsFirstAdmin")
 
 	a.ctx = newCtx
-	a.app.Srv().Store.SetContext(newCtx)
+	a.app.Srv().Store().SetContext(newCtx)
 	defer func() {
-		a.app.Srv().Store.SetContext(origCtx)
+		a.app.Srv().Store().SetContext(origCtx)
 		a.ctx = origCtx
 	}()
 
diff --git a/app/user.go b/app/user.go
index 929d86116f..9b0840eea6 100644
--- a/app/user.go
+++ b/app/user.go
@@ -2677,7 +2677,7 @@ func (a *App) UserIsFirstAdmin(user *model.User) bool {
 		return false
 	}
 
-	systemAdminUsers, errServer := a.Srv().Store.User().GetSystemAdminProfiles()
+	systemAdminUsers, errServer := a.Srv().Store().User().GetSystemAdminProfiles()
 	if errServer != nil {
 		mlog.Warn("Failed to get system admins to check for first admin from Mattermost.")
 		return false