diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
index d6231a8da6b..5e229c7d85a 100644
--- a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
+++ b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
@@ -117,11 +117,9 @@ void QgsEditorWidgetWrapper::updateConstraint( const QgsFeature &ft )
   {
     description = layer()->editFormConfig().expressionDescription( mFieldIdx );
 
-    QgsExpressionContext context =
-      QgsExpressionContextUtils::createFeatureBasedContext( ft, ft.fields() );
-    context << QgsExpressionContextUtils::layerScope( layer() );
-
+    QgsExpressionContext context = layer()->createExpressionContext();
     context.setFeature( ft );
+
     QgsExpression expr( expression );
 
     mValidConstraint = expr.evaluate( &context ).toBool();