Mr Flavell's bill would allow any person taking a statutory oath to also say they would uphold the Treaty of Waitangi, including MPs who were being sworn into Parliament.
At present, the swearing-in oath reads: "I swear that I will be faithful and bear true allegiance to Her Majesty, Queen Elizabeth II, her heirs and successors, according to law, so help me God."
If the bill passed, MPs would be able to add: "I will uphold the Treaty of Waitangi."
Mana Party leader Hone Harawira was forced by Speaker Lockwood Smith to delay his swearing-in last year because he inserted a reference to the Treaty in his oath, instead of making a formal oath to the Queen.
In the past MPs from the Maori Party and some in the Greens have altered the swearing-in oath to include the Treaty of Waitangi before being stopped and told to deliver the correct wording stipulated by law.
The rules were changed in 2004 to allow MPs to give an oath in Maori or English.