diff --git a/server/services/store/sqlstore/migrate.go b/server/services/store/sqlstore/migrate.go
index 63b681403da..c59a914ffc1 100644
--- a/server/services/store/sqlstore/migrate.go
+++ b/server/services/store/sqlstore/migrate.go
@@ -557,7 +557,12 @@ func (s *SQLStore) getDMBoards(tx sq.BaseRunner) ([]*model.Board, error) {
 		},
 	}
 
-	return s.getBoardsByCondition(tx, conditions)
+	boards, err := s.getBoardsByCondition(tx, conditions)
+	if err != nil && errors.Is(err, sql.ErrNoRows) {
+		return []*model.Board{}, nil
+	}
+
+	return boards, err
 }
 
 // The destination is selected as the first team where all members