diff --git a/src/components/App/Settings.tsx b/src/components/App/Settings.tsx
index 875708e9..ef1c7669 100644
--- a/src/components/App/Settings.tsx
+++ b/src/components/App/Settings.tsx
@@ -10,10 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR W3C-20150513
  ********************************************************************************/
-import React, { useState, useEffect, useCallback } from "react";
+import React, { useState, useEffect, useCallback, useContext } from "react";
 import InfoIconWrapper from "../base/InfoIconWrapper";
 import TextField from "../base/TextField";
 import { isValidUrl } from "../../utils/strings";
+import EdiTDorContext from "../../context/ediTDorContext";
+import Dropdown from "../base/Dropdown";
 
 export interface SettingsData {
   northboundUrl: string;
@@ -44,6 +46,7 @@ const Settings: React.FC<SettingsProps> = ({
   hideTitle = false,
   className = "",
 }) => {
+  const context = useContext(EdiTDorContext);
   const [data, setData] = useState<SettingsData>(initialData);
   const [errors, setErrors] = useState<SettingsErrors>({
     northboundUrl: "",
@@ -51,10 +54,6 @@ const Settings: React.FC<SettingsProps> = ({
     pathToValue: "",
   });
 
-  useEffect(() => {
-    setData(initialData);
-  }, [initialData]);
-
   useEffect(() => {
     if (onChange) {
       const isValid =
@@ -127,8 +126,31 @@ const Settings: React.FC<SettingsProps> = ({
     []
   );
 
+  const handleJsonIndentationChange = useCallback(
+    (e: React.ChangeEvent<HTMLSelectElement>) => {
+      const parsed = Number(e.target.value);
+      const value: 2 | 4 = parsed === 4 ? 4 : 2;
+      context.updateJsonIndentation(value);
+    },
+    [context]
+  );
+
   return (
     <div className={className}>
+      <div className="my-4 rounded-md bg-black bg-opacity-80 p-2">
+        {!hideTitle && <h1 className="font-bold">JSON Editor</h1>}
+        <div className="px-4">
+          <Dropdown
+            id="json-indentation-select"
+            label="Space indentation"
+            value={String(context.jsonIndentation)}
+            onChange={handleJsonIndentationChange}
+            options={["2", "4"]}
+            className="w-full"
+          />
+        </div>
+      </div>
+
       <div className="rounded-md bg-black bg-opacity-80 p-2">
         {!hideTitle && (
           <h1 className="font-bold">Third Party Service Configuration</h1>
diff --git a/src/components/Editor/JsonEditor.tsx b/src/components/Editor/JsonEditor.tsx
index 9e92eff6..4ba90f28 100644
--- a/src/components/Editor/JsonEditor.tsx
+++ b/src/components/Editor/JsonEditor.tsx
@@ -27,13 +27,6 @@ import { IValidationMessage } from "../../types/context";
 type SchemaMapMessage = Map<string, Record<string, unknown>>;
 
 // List of all Options can be found here: https://microsoft.github.io/monaco-editor/docs.html#interfaces/editor.IStandaloneEditorConstructionOptions.html
-const editorOptions: editor.IStandaloneEditorConstructionOptions = {
-  selectOnLineNumbers: true,
-  automaticLayout: true,
-  lineDecorationsWidth: 20,
-  tabSize: 2,
-  insertSpaces: true,
-};
 
 // delay function that executes the callback once it hasn't been called for
 // at least x ms.
@@ -54,6 +47,7 @@ interface JsonSchemaEntry {
 const JsonEditor: React.FC<JsonEditorProps> = ({ editorRef }) => {
   const context = useContext(ediTDorContext);
 
+  const jsonIndentation = context.jsonIndentation ?? 2;
   const [schemas] = useState<JsonSchemaEntry[]>([]);
   const [proxy, setProxy] = useState<any>(undefined);
   const editorInstance = useRef<editor.IStandaloneCodeEditor | null>(null);
@@ -85,6 +79,8 @@ const JsonEditor: React.FC<JsonEditorProps> = ({ editorRef }) => {
   );
 
   useEffect(() => {
+    if (!proxy) return;
+
     const updateMonacoSchemas = (schemaMap: SchemaMapMessage) => {
       proxy.splice(0, proxy.length);
 
@@ -165,10 +161,8 @@ const JsonEditor: React.FC<JsonEditorProps> = ({ editorRef }) => {
     setProxy(proxy);
   };
 
-  const onChange: OnChange = async (editorText: string | undefined) => {
-    if (!editorText) {
-      return;
-    }
+  const onChange: OnChange = (editorText: string | undefined) => {
+    if (!editorText) return;
     let validate: IValidationMessage = {
       report: {
         json: null,
@@ -199,15 +193,19 @@ const JsonEditor: React.FC<JsonEditorProps> = ({ editorRef }) => {
       },
       customMessage: "",
     };
+
     try {
       JSON.parse(editorText);
-      context.updateOfflineTD(editorText);
 
+      if (editorText !== context.offlineTD) {
+        context.updateOfflineTD(editorText);
+      }
+
+      setLocalTextState(editorText);
       context.updateValidationMessage(validate);
+
+      delay(messageWorkers, editorText, 500);
     } catch (error) {
-      let message: string =
-        "Invalid JSON: " +
-        (error instanceof Error ? error.message : String(error));
       validate.report.json = "failed";
       context.updateValidationMessage(validate);
       setLocalTextState(editorText);
@@ -242,6 +240,19 @@ const JsonEditor: React.FC<JsonEditorProps> = ({ editorRef }) => {
     }
   }, [context.linkedTd, context.offlineTD]);
 
+  useEffect(() => {
+    try {
+      const parsed = JSON.parse(context.offlineTD);
+      const formatted = JSON.stringify(parsed, null, jsonIndentation);
+
+      if (formatted !== context.offlineTD) {
+        context.updateOfflineTD(formatted);
+      }
+    } catch {
+      // ignore invalid JSON
+    }
+  }, [jsonIndentation, context.offlineTD]);
+
   const changeLinkedTd = async () => {
     let href = (document.getElementById("linkedTd") as HTMLSelectElement).value;
     changeBetweenTd(context, href);
@@ -255,6 +266,18 @@ const JsonEditor: React.FC<JsonEditorProps> = ({ editorRef }) => {
     });
   };
 
+  const editorOptions = useMemo(
+    () => ({
+      selectOnLineNumbers: true,
+      automaticLayout: true,
+      lineDecorationsWidth: 20,
+      tabSize: jsonIndentation,
+      insertSpaces: true,
+      detectIndentation: false,
+    }),
+    [jsonIndentation]
+  );
+
   return (
     <>
       <div className="h-[5%] bg-[#1e1e1e]">
diff --git a/src/components/base/Dropdown.tsx b/src/components/base/Dropdown.tsx
index 74d2fe5f..34c04f35 100644
--- a/src/components/base/Dropdown.tsx
+++ b/src/components/base/Dropdown.tsx
@@ -17,6 +17,8 @@ interface IDropdownProps {
   id: string;
   label: string;
   options: string[];
+  value?: string;
+  onChange?: (event: React.ChangeEvent<HTMLSelectElement>) => void;
   className?: string;
 }
 
@@ -33,6 +35,8 @@ const Dropdown: React.FC<IDropdownProps> = (props) => {
         <select
           className="block w-full appearance-none rounded border-2 border-gray-600 bg-gray-600 px-4 py-3 pr-8 leading-tight text-white focus:border-blue-500 focus:outline-none"
           id={props.id}
+          value={props.value}
+          onChange={props.onChange}
         >
           {props.options.map((e) => {
             return <option key={e}>{e}</option>;
diff --git a/src/context/GlobalState.tsx b/src/context/GlobalState.tsx
index fdfe6572..58b79a2b 100644
--- a/src/context/GlobalState.tsx
+++ b/src/context/GlobalState.tsx
@@ -28,6 +28,7 @@ export const UPDATE_VALIDATION_MESSAGE = "UPDATE_VALIDATION_MESSAGE";
 export const UPDATE_NORTHBOUND_CONNECTION = "UPDATE_NORTHBOUND_CONNECTION";
 export const UPDATE_CONTRIBUTE_CATALOG = "UPDATE_CONTRIBUTE_CATALOG";
 export const UPDATE_BACKGROUND_TM = "UPDATE_BACKGROUND_TM";
+export const UPDATE_JSON_INDENTATION = "UPDATE_JSON_INDENTATION";
 
 interface IGlobalStateProps {
   children: ReactNode;
@@ -93,6 +94,7 @@ const GlobalState: React.FC<IGlobalStateProps> = ({ children }) => {
       nameRepository: "",
       dynamicValues: {},
     },
+    jsonIndentation: 2,
   });
 
   const updateOfflineTD = (offlineTD: string) => {
@@ -177,6 +179,13 @@ const GlobalState: React.FC<IGlobalStateProps> = ({ children }) => {
     });
   };
 
+  const updateJsonIndentation = (value: 2 | 4) => {
+    dispatch({
+      type: UPDATE_JSON_INDENTATION,
+      value,
+    });
+  };
+
   return (
     <EdiTDorContext.Provider
       value={{
@@ -190,6 +199,7 @@ const GlobalState: React.FC<IGlobalStateProps> = ({ children }) => {
         validationMessage: editdorState.validationMessage,
         northboundConnection: editdorState.northboundConnection,
         contributeCatalog: editdorState.contributeCatalog,
+        jsonIndentation: editdorState.jsonIndentation,
         updateOfflineTD,
         updateIsModified,
         setFileHandle,
@@ -202,6 +212,7 @@ const GlobalState: React.FC<IGlobalStateProps> = ({ children }) => {
         updateValidationMessage,
         updateNorthboundConnection,
         updateContributeCatalog,
+        updateJsonIndentation,
       }}
     >
       {children}
diff --git a/src/context/ediTDorContext.ts b/src/context/ediTDorContext.ts
index 8062201d..c4260306 100644
--- a/src/context/ediTDorContext.ts
+++ b/src/context/ediTDorContext.ts
@@ -69,6 +69,7 @@ const defaultContext: IEdiTDorContext = {
     nameRepository: "",
     dynamicValues: {},
   },
+  jsonIndentation: 2,
 
   updateOfflineTD: () => {},
   updateIsModified: () => {},
@@ -82,6 +83,7 @@ const defaultContext: IEdiTDorContext = {
   updateValidationMessage: () => {},
   updateNorthboundConnection: () => {},
   updateContributeCatalog: () => {},
+  updateJsonIndentation: () => {},
 };
 
 const ediTDorContext = React.createContext<IEdiTDorContext>(defaultContext);
diff --git a/src/context/editorReducers.ts b/src/context/editorReducers.ts
index 35e5bfb5..cda01f2e 100644
--- a/src/context/editorReducers.ts
+++ b/src/context/editorReducers.ts
@@ -23,6 +23,7 @@ import {
   UPDATE_VALIDATION_MESSAGE,
   UPDATE_NORTHBOUND_CONNECTION,
   UPDATE_CONTRIBUTE_CATALOG,
+  UPDATE_JSON_INDENTATION,
 } from "./GlobalState";
 import type {
   ThingDescription,
@@ -70,6 +71,8 @@ export const editdorReducer = (
       return updateNorthboundConnection(action.northboundConnection, state);
     case UPDATE_CONTRIBUTE_CATALOG:
       return updateContributeCatalog(action.contributeCatalog, state);
+    case UPDATE_JSON_INDENTATION:
+      return updateJsonIndentationReducer(action.value, state);
     default:
       return state;
   }
@@ -365,3 +368,12 @@ const updateContributeCatalog = (
 ): EditorState => {
   return { ...state, contributeCatalog };
 };
+const updateJsonIndentationReducer = (
+  jsonIndentation: 2 | 4,
+  state: EditorState
+): EditorState => {
+  return {
+    ...state,
+    jsonIndentation,
+  };
+};
diff --git a/src/types/context.d.ts b/src/types/context.d.ts
index 48154da3..142d62e2 100644
--- a/src/types/context.d.ts
+++ b/src/types/context.d.ts
@@ -13,6 +13,8 @@ declare global {
 
     northboundConnection: INorthboundConnection;
     contributeCatalog: IContributeCatalog;
+    jsonIndentation: 2 | 4;
+    updateJsonIndentation: (value: 2 | 4) => void;
 
     // Callback functions
     updateOfflineTD: (td: string) => void;
@@ -106,6 +108,7 @@ declare global {
     | "updateValidationMessage"
     | "updateNorthboundConnection"
     | "updateContributeCatalog"
+    | "updateJsonIndentation"
   >;
 
   type Action =
@@ -141,7 +144,8 @@ declare global {
     | {
         type: "UPDATE_CONTRIBUTE_CATALOG";
         contributeCatalog: IContributeCatalog;
-      };
+      }
+    | { type: "UPDATE_JSON_INDENTATION"; value: 2 | 4 };
 
   declare type Validation = "VALID" | "INVALID" | "VALIDATING" | null;
   declare type ActiveSection =