diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index d45131acfc..d27a50551e 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -31,6 +31,7 @@
 					:parameters="parametersNoneSetting"
 					:hideDelete="true"
 					:nodeValues="nodeValues" path="parameters" @valueChanged="valueChanged"
+					:showCredentialsAfter="showCredentialsAfter"
 				>
 					<node-credentials
 						:node="node"
@@ -81,6 +82,8 @@ import { nodeHelpers } from '@/components/mixins/nodeHelpers';
 import mixins from 'vue-typed-mixins';
 import NodeExecuteButton from './NodeExecuteButton.vue';
 
+import { HTTP_REQUEST_NODE_TYPE } from '@/constants';
+
 export default mixins(
 	externalHooks,
 	genericHelpers,
@@ -158,6 +161,9 @@ export default mixins(
 
 				return this.nodeType.properties;
 			},
+			showCredentialsAfter (): boolean {
+				return this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2;
+			},
 		},
 		props: {
 			eventBus: {
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index a6658344da..40531b924b 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="parameter-input-list-wrapper" :class="{ 'has-reordered-credentials-input': hasReorderedCredentialsInput }">
+	<div class="parameter-input-list-wrapper" :class="{ 'has-reordered-credentials-input': showCredentialsAfter }">
 		<slot />
 		<div v-for="parameter in filteredParameters" :key="parameter.name" :class="{indent}">
 			<div
@@ -118,6 +118,7 @@ export default mixins(
 			'path', // string
 			'hideDelete', // boolean
 			'indent',
+			'showCredentialsAfter', // boolean
 		],
 		computed: {
 			filteredParameters (): INodeProperties[] {
@@ -126,11 +127,6 @@ export default mixins(
 			filteredParameterNames (): string[] {
 				return this.filteredParameters.map(parameter => parameter.name);
 			},
-			hasReorderedCredentialsInput(): boolean {
-				const node: INode = this.$store.getters.activeNode;
-
-				return ["n8n-nodes-base.httpRequest"].includes(node.type);
-			},
 			node (): INodeUi {
 				return this.$store.getters.activeNode;
 			},