diff --git a/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx b/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx
index d1afd378f4..7e14ed0a63 100644
--- a/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx
+++ b/frontend/src/Editor/QueryManager/Components/DataSourceSelect.jsx
@@ -14,6 +14,7 @@ import { DataBaseSources, ApiSources, CloudStorageSources } from '@/modules/comm
 import { canCreateDataSource } from '@/_helpers';
 import './../queryManager.theme.scss';
 import { DATA_SOURCE_TYPE } from '@/_helpers/constants';
+import { workflowDefaultSources } from '../constants';
 
 function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSources, onNewNode, staticDataSources }) {
   const dataSources = useDataSources();
@@ -32,6 +33,10 @@ function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSourc
     closePopup();
   };
 
+  function cleanWord(word) {
+    return word.replace(/default/g, '');
+  }
+
   useEffect(() => {
     const shouldAddSampleDataSource = !!sampleDataSource;
     const allDataSources = [...dataSources, ...globalDataSources, shouldAddSampleDataSource && sampleDataSource].filter(
@@ -146,7 +151,7 @@ function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSourc
         label: (
           <div>
             <DataSourceIcon source={source} height={16} />{' '}
-            <span className="ms-1 small">{source?.name ?? source.kind}</span>
+            <span className="ms-1 small"> {workflowDefaultSources[cleanWord(source.name)]?.name}</span>
           </div>
         ),
         value: source.name,
diff --git a/frontend/src/Editor/QueryManager/constants.js b/frontend/src/Editor/QueryManager/constants.js
index f06125ef3c..e8f7739429 100644
--- a/frontend/src/Editor/QueryManager/constants.js
+++ b/frontend/src/Editor/QueryManager/constants.js
@@ -106,3 +106,10 @@ export const defaultSources = {
   runpy: { kind: 'runpy', id: 'runpy', name: 'Run Python code' },
   workflows: { kind: 'workflows', id: 'null', name: 'Run Workflow' },
 };
+
+export const workflowDefaultSources = {
+  ...defaultSources,
+  'If condition': { kind: 'if', id: 'if', name: 'If condition' },
+  Response: { kind: 'response', id: 'response', name: 'Response' },
+  Loop: { kind: 'loop', id: 'loop', name: 'Loop' },
+};
diff --git a/server/ee b/server/ee
index 076a96e761..1adb563573 160000
--- a/server/ee
+++ b/server/ee
@@ -1 +1 @@
-Subproject commit 076a96e7614285c57bfdf2f2729247aefbc8c80e
+Subproject commit 1adb563573bde7d204976a45c06ef4ce96d7dad3