diff --git a/src/Handler/Utils/Form/MassInput.hs b/src/Handler/Utils/Form/MassInput.hs
index f6a383e7c..31696d224 100644
--- a/src/Handler/Utils/Form/MassInput.hs
+++ b/src/Handler/Utils/Form/MassInput.hs
@@ -415,7 +415,7 @@ massInput MassInput{..} FieldSettings{..} fvRequired initialResult csrf = do
 
   MsgRenderer mr <- getMsgRenderer
 
-  whenM (hasCustomHeader HeaderMassInputShortcircuit) . liftHandlerT $ do
+  whenM ((== Just fvId) <$> lookupCustomHeader HeaderMassInputShortcircuit) . liftHandlerT $ do
     PageContent{..} <- widgetToPageContent $(widgetFile "widgets/massinput/massinput-standalone")
     ur <- getUrlRenderParams