diff --git a/server/.golangci.yml b/server/.golangci.yml
index 65124f3b82..f45ed77bc3 100644
--- a/server/.golangci.yml
+++ b/server/.golangci.yml
@@ -91,7 +91,6 @@ issues:
         channels/app/helper_test.go|\
         channels/app/import_functions.go|\
         channels/app/integration_action.go|\
-        channels/app/migrations.go|\
         channels/app/permissions.go|\
         channels/app/permissions_test.go|\
         channels/app/platform/helper_test.go|\
diff --git a/server/channels/app/app_iface.go b/server/channels/app/app_iface.go
index baca433b63..8459ef20d4 100644
--- a/server/channels/app/app_iface.go
+++ b/server/channels/app/app_iface.go
@@ -590,8 +590,8 @@ type AppIface interface {
 	DoAppMigrations()
 	DoCheckForAdminNotifications(trial bool) *model.AppError
 	DoCommandRequest(rctx request.CTX, cmd *model.Command, p url.Values) (*model.Command, *model.CommandResponse, *model.AppError)
-	DoEmojisPermissionsMigration()
-	DoGuestRolesCreationMigration()
+	DoEmojisPermissionsMigration() error
+	DoGuestRolesCreationMigration() error
 	DoLocalRequest(c request.CTX, rawURL string, body []byte) (*http.Response, *model.AppError)
 	DoLogin(c request.CTX, w http.ResponseWriter, r *http.Request, user *model.User, deviceID string, isMobile, isOAuthUser, isSaml bool) (*model.Session, *model.AppError)
 	DoPostActionWithCookie(c request.CTX, postID, actionId, userID, selectedOption string, cookie *model.PostActionCookie) (string, *model.AppError)
diff --git a/server/channels/app/app_test.go b/server/channels/app/app_test.go
index 365454956c..510f575dcc 100644
--- a/server/channels/app/app_test.go
+++ b/server/channels/app/app_test.go
@@ -255,7 +255,8 @@ func TestDoEmojisPermissionsMigration(t *testing.T) {
 	sort.Strings(expectedSystemAdmin)
 
 	th.ResetEmojisMigration()
-	th.App.DoEmojisPermissionsMigration()
+	err := th.App.DoEmojisPermissionsMigration()
+	require.NoError(t, err)
 
 	role3, err3 := th.App.GetRoleByName(context.Background(), model.SystemUserRoleId)
 	assert.Nil(t, err3)
diff --git a/server/channels/app/migrations.go b/server/channels/app/migrations.go
index c09cac5bc9..6c1615f210 100644
--- a/server/channels/app/migrations.go
+++ b/server/channels/app/migrations.go
@@ -104,8 +104,11 @@ func (a *App) SetPhase2PermissionsMigrationStatus(isComplete bool) error {
 	return nil
 }
 
-func (a *App) DoEmojisPermissionsMigration() {
-	a.Srv().doEmojisPermissionsMigration()
+func (a *App) DoEmojisPermissionsMigration() error {
+	if err := a.Srv().doEmojisPermissionsMigration(); err != nil {
+		return fmt.Errorf("Failed to complete emojis permissions migration: %w", err)
+	}
+	return nil
 }
 
 func (s *Server) doEmojisPermissionsMigration() error {
@@ -162,8 +165,11 @@ func (s *Server) doEmojisPermissionsMigration() error {
 	return nil
 }
 
-func (a *App) DoGuestRolesCreationMigration() {
-	a.Srv().doGuestRolesCreationMigration()
+func (a *App) DoGuestRolesCreationMigration() error {
+	if err := a.Srv().doGuestRolesCreationMigration(); err != nil {
+		return fmt.Errorf("Failed to complete guest roles creation migration: %w", err)
+	}
+	return nil
 }
 
 func (s *Server) doGuestRolesCreationMigration() error {
diff --git a/server/channels/app/opentracing/opentracing_layer.go b/server/channels/app/opentracing/opentracing_layer.go
index a0a758e30f..ddc76bdf07 100644
--- a/server/channels/app/opentracing/opentracing_layer.go
+++ b/server/channels/app/opentracing/opentracing_layer.go
@@ -4050,7 +4050,7 @@ func (a *OpenTracingAppLayer) DoCommandRequest(rctx request.CTX, cmd *model.Comm
 	return resultVar0, resultVar1, resultVar2
 }
 
-func (a *OpenTracingAppLayer) DoEmojisPermissionsMigration() {
+func (a *OpenTracingAppLayer) DoEmojisPermissionsMigration() error {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.DoEmojisPermissionsMigration")
 
@@ -4062,10 +4062,17 @@ func (a *OpenTracingAppLayer) DoEmojisPermissionsMigration() {
 	}()
 
 	defer span.Finish()
-	a.app.DoEmojisPermissionsMigration()
+	resultVar0 := a.app.DoEmojisPermissionsMigration()
+
+	if resultVar0 != nil {
+		span.LogFields(spanlog.Error(resultVar0))
+		ext.Error.Set(span, true)
+	}
+
+	return resultVar0
 }
 
-func (a *OpenTracingAppLayer) DoGuestRolesCreationMigration() {
+func (a *OpenTracingAppLayer) DoGuestRolesCreationMigration() error {
 	origCtx := a.ctx
 	span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.DoGuestRolesCreationMigration")
 
@@ -4077,7 +4084,14 @@ func (a *OpenTracingAppLayer) DoGuestRolesCreationMigration() {
 	}()
 
 	defer span.Finish()
-	a.app.DoGuestRolesCreationMigration()
+	resultVar0 := a.app.DoGuestRolesCreationMigration()
+
+	if resultVar0 != nil {
+		span.LogFields(spanlog.Error(resultVar0))
+		ext.Error.Set(span, true)
+	}
+
+	return resultVar0
 }
 
 func (a *OpenTracingAppLayer) DoLocalRequest(c request.CTX, rawURL string, body []byte) (*http.Response, *model.AppError) {