diff --git a/fmriprep/workflows/bold/base.py b/fmriprep/workflows/bold/base.py
index d0af5772c..684691c79 100644
--- a/fmriprep/workflows/bold/base.py
+++ b/fmriprep/workflows/bold/base.py
@@ -1101,17 +1101,16 @@ def init_func_preproc_wf(bold_file, has_fieldmap=False):
             (("outputnode.fieldwarp", _pop), "inputnode.fieldwarp"),
         ]),
         (unwarp_wf, bold_final, [("outputnode.corrected", "bold")]),
-
+        (unwarp_wf, bold_t1_trans_wf, [
+            # TEMPORARY: For the moment we can't use frame-wise fieldmaps
+            (("outputnode.fieldwarp", _pop), "inputnode.fieldwarp"),
+        ]),
     ])
     # fmt:on
 
     if not multiecho:
         # fmt:off
         workflow.connect([
-            (unwarp_wf, bold_t1_trans_wf, [
-                # TEMPORARY: For the moment we can't use frame-wise fieldmaps
-                (("outputnode.fieldwarp", _pop), "inputnode.fieldwarp"),
-            ]),
             (bold_split, unwarp_wf, [
                 ("out_files", "inputnode.distorted")]),
         ])