diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
index 7213592e02b5..e4715364924b 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp
@@ -193,21 +193,21 @@ template <class Flavor> void ProverInstance_<Flavor>::construct_ecc_op_wire_poly
  * @tparam Flavor
  * @param circuit
  */
-template <class Flavor> void ProverInstance_<Flavor>::construct_databus_polynomials(Circuit& circuit)
+template <class Flavor>
+void ProverInstance_<Flavor>::construct_databus_polynomials(Circuit& circuit)
+    requires IsGoblinFlavor<Flavor>
 {
-    if constexpr (IsGoblinFlavor<Flavor>) {
-        polynomial public_calldata(dyadic_circuit_size);
-        polynomial calldata_read_counts(dyadic_circuit_size);
+    polynomial public_calldata(dyadic_circuit_size);
+    polynomial calldata_read_counts(dyadic_circuit_size);
 
-        // We do not utilize a zero row for databus columns
-        for (size_t idx = 0; idx < circuit.public_calldata.size(); ++idx) {
-            public_calldata[idx] = circuit.get_variable(circuit.public_calldata[idx]);
-            calldata_read_counts[idx] = circuit.get_variable(circuit.calldata_read_counts[idx]);
-        }
-
-        proving_key->calldata = public_calldata;
-        proving_key->calldata_read_counts = calldata_read_counts;
+    // We do not utilize a zero row for databus columns
+    for (size_t idx = 0; idx < circuit.public_calldata.size(); ++idx) {
+        public_calldata[idx] = circuit.get_variable(circuit.public_calldata[idx]);
+        calldata_read_counts[idx] = circuit.get_variable(circuit.calldata_read_counts[idx]);
     }
+
+    proving_key->calldata = public_calldata;
+    proving_key->calldata_read_counts = calldata_read_counts;
 }
 
 template <class Flavor>
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
index 1af886caa54a..52de9dc14db0 100644
--- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
+++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp
@@ -95,7 +95,8 @@ template <class Flavor> class ProverInstance_ {
 
     void construct_ecc_op_wire_polynomials(auto&);
 
-    void construct_databus_polynomials(Circuit&);
+    void construct_databus_polynomials(Circuit&)
+        requires IsGoblinFlavor<Flavor>;
 
     void add_table_column_selector_poly_to_proving_key(barretenberg::polynomial& small, const std::string& tag);