In this paper, I argue that John Calvin's problematic grant of magisterial authority to enforce proper religious worship contradicts much of his own political theology and in fact depends upon an ambiguity in his natural law theory. I demonstrate this ambiguity by examining the differing claims in the Institutes regarding which of the tables of the Decalogue are accessible through natural law reasoning. I also consider the significance of this ambiguity for Calvin's political theology. I then suggest a partial retrieval of Calvin's political theology which is both more compelling to many contemporary Christians and in a better alignment with much of Calvin's own political theory.