diff --git a/packages/twenty-ui-deprecated/src/input/code-editor/components/CodeEditor.tsx b/packages/twenty-ui-deprecated/src/input/code-editor/components/CodeEditor.tsx
index 16df34e685..441cd51f10 100644
--- a/packages/twenty-ui-deprecated/src/input/code-editor/components/CodeEditor.tsx
+++ b/packages/twenty-ui-deprecated/src/input/code-editor/components/CodeEditor.tsx
@@ -215,6 +215,7 @@ export const CodeEditor = ({
             formatOnPaste: true,
             formatOnType: true,
             overviewRulerLanes: 0,
+            scrollBeyondLastLine: false,
             scrollbar: {
               vertical: 'hidden',
               horizontal: 'hidden',
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx b/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
index 339b90ff77..0665b8c47f 100644
--- a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
+++ b/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
@@ -144,6 +144,7 @@ export const CodeEditor = ({
             formatOnPaste: true,
             formatOnType: true,
             overviewRulerLanes: 0,
+            scrollBeyondLastLine: false,
             scrollbar: {
               vertical: 'hidden',
               horizontal: 'hidden',