diff --git a/kernel/ff.cc b/kernel/ff.cc
index 7dd5e24ac..3a2c07890 100644
--- a/kernel/ff.cc
+++ b/kernel/ff.cc
@@ -635,8 +635,6 @@ Cell *FfData::emit() {
 			return nullptr;
 		}
 	}
-	if (initvals && !is_anyinit)
-		initvals->set_init(sig_q, val_init);
 	if (!is_fine) {
 		if (has_gclk) {
 			log_assert(!has_clk);
@@ -747,6 +745,8 @@ Cell *FfData::emit() {
 		}
 	}
 	cell->attributes = attributes;
+	if (initvals && !is_anyinit)
+		initvals->set_init(cell->getPort(ID::Q), val_init);
 	return cell;
 }