diff --git a/src/components/entries/FEEL/Feel.js b/src/components/entries/FEEL/Feel.js
index a8c7cd4e..ecc2b588 100644
--- a/src/components/entries/FEEL/Feel.js
+++ b/src/components/entries/FEEL/Feel.js
@@ -28,7 +28,7 @@ import FeelIcon from './FeelIcon';
 
 import { FEEL_POPUP_WIDTH } from './FeelPopup';
 
-import { FeelPopupContext } from './context';
+import { FeelLanguageContext, FeelPopupContext } from './context';
 
 import { ToggleSwitch } from '../ToggleSwitch';
 
@@ -67,6 +67,8 @@ function FeelTextfieldComponent(props) {
 
   const [ focus, _setFocus ] = useState(undefined);
 
+  const languageContext = useContext(FeelLanguageContext);
+
   const {
     open: openPopup,
     source: popupSource
@@ -249,6 +251,7 @@ function FeelTextfieldComponent(props) {
             placeholder={ placeholder }
             value={ feelOnlyValue }
             variables={ variables }
+            languageContext={ languageContext }
             ref={ editorRef }
             tooltipContainer={ tooltipContainer }
           /> :
diff --git a/src/components/entries/FEEL/context/FeelLanguageContext.js b/src/components/entries/FEEL/context/FeelLanguageContext.js
new file mode 100644
index 00000000..3f29f96a
--- /dev/null
+++ b/src/components/entries/FEEL/context/FeelLanguageContext.js
@@ -0,0 +1,9 @@
+import {
+  createContext
+} from 'preact';
+
+const FeelLanguageContext = createContext({
+  dialect: 'expression'
+});
+
+export default FeelLanguageContext;
\ No newline at end of file
diff --git a/src/components/entries/FEEL/context/index.js b/src/components/entries/FEEL/context/index.js
index 677b2e3c..1b107945 100644
--- a/src/components/entries/FEEL/context/index.js
+++ b/src/components/entries/FEEL/context/index.js
@@ -1 +1,3 @@
-export { default as FeelPopupContext } from './FeelPopupContext';
\ No newline at end of file
+export { default as FeelPopupContext } from './FeelPopupContext';
+
+export { default as FeelLanguageContext } from './FeelLanguageContext';
\ No newline at end of file