diff --git a/client/src/components/Chat/Presentation.tsx b/client/src/components/Chat/Presentation.tsx
index c92f604ee1..68ec6f0f2e 100644
--- a/client/src/components/Chat/Presentation.tsx
+++ b/client/src/components/Chat/Presentation.tsx
@@ -23,7 +23,6 @@ export default function Presentation({
 }) {
   const { data: startupConfig } = useGetStartupConfig();
   const artifacts = useRecoilValue(store.artifactsState);
-  const codeArtifacts = useRecoilValue(store.codeArtifacts);
   const hideSidePanel = useRecoilValue(store.hideSidePanel);
   const artifactsVisible = useRecoilValue(store.artifactsVisible);
 
@@ -91,13 +90,11 @@ export default function Presentation({
           defaultCollapsed={defaultCollapsed}
           fullPanelCollapse={fullCollapse}
           artifacts={
-            artifactsVisible === true &&
-            codeArtifacts === true &&
-            Object.keys(artifacts ?? {}).length > 0 ? (
-                <EditorProvider>
-                  <Artifacts />
-                </EditorProvider>
-              ) : null
+            artifactsVisible === true && Object.keys(artifacts ?? {}).length > 0 ? (
+              <EditorProvider>
+                <Artifacts />
+              </EditorProvider>
+            ) : null
           }
         >
           <main className="flex h-full flex-col overflow-y-auto" role="main">
diff --git a/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx b/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx
index dd985a86af..7b924507c1 100644
--- a/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx
+++ b/client/src/components/Nav/SettingsTabs/Beta/CodeArtifacts.tsx
@@ -5,18 +5,9 @@ import { useLocalize } from '~/hooks';
 import store from '~/store';
 
 export default function CodeArtifacts() {
-  const [codeArtifacts, setCodeArtifacts] = useRecoilState<boolean>(store.codeArtifacts);
+  const localize = useLocalize();
   const [includeShadcnui, setIncludeShadcnui] = useRecoilState<boolean>(store.includeShadcnui);
   const [customPromptMode, setCustomPromptMode] = useRecoilState<boolean>(store.customPromptMode);
-  const localize = useLocalize();
-
-  const handleCodeArtifactsChange = (value: boolean) => {
-    setCodeArtifacts(value);
-    if (!value) {
-      setIncludeShadcnui(false);
-      setCustomPromptMode(false);
-    }
-  };
 
   const handleIncludeShadcnuiChange = (value: boolean) => {
     setIncludeShadcnui(value);
@@ -33,20 +24,13 @@ export default function CodeArtifacts() {
     <div className="space-y-4">
       <h3 className="text-lg font-medium">{localize('com_ui_artifacts')}</h3>
       <div className="space-y-2">
-        <SwitchItem
-          id="codeArtifacts"
-          label={localize('com_ui_artifacts_toggle')}
-          checked={codeArtifacts}
-          onCheckedChange={handleCodeArtifactsChange}
-          hoverCardText="com_nav_info_code_artifacts"
-        />
         <SwitchItem
           id="includeShadcnui"
           label={localize('com_ui_include_shadcnui')}
           checked={includeShadcnui}
           onCheckedChange={handleIncludeShadcnuiChange}
           hoverCardText="com_nav_info_include_shadcnui"
-          disabled={!codeArtifacts || customPromptMode}
+          disabled={customPromptMode}
         />
         <SwitchItem
           id="customPromptMode"
@@ -54,7 +38,6 @@ export default function CodeArtifacts() {
           checked={customPromptMode}
           onCheckedChange={handleCustomPromptModeChange}
           hoverCardText="com_nav_info_custom_prompt_mode"
-          disabled={!codeArtifacts}
         />
       </div>
     </div>
diff --git a/client/src/hooks/Chat/useChatFunctions.ts b/client/src/hooks/Chat/useChatFunctions.ts
index 3b7b11132e..09c70a0260 100644
--- a/client/src/hooks/Chat/useChatFunctions.ts
+++ b/client/src/hooks/Chat/useChatFunctions.ts
@@ -64,7 +64,6 @@ export default function useChatFunctions({
   setSubmission: SetterOrUpdater<TSubmission | null>;
   setLatestMessage?: SetterOrUpdater<TMessage | null>;
 }) {
-  const codeArtifacts = useRecoilValue(store.codeArtifacts);
   const includeShadcnui = useRecoilValue(store.includeShadcnui);
   const customPromptMode = useRecoilValue(store.customPromptMode);
   const resetLatestMultiMessage = useResetRecoilState(store.latestMessageFamily(index + 1));
@@ -170,7 +169,7 @@ export default function useChatFunctions({
         endpointType,
         overrideConvoId,
         overrideUserMessageId,
-        artifacts: getArtifactsMode({ codeArtifacts, includeShadcnui, customPromptMode }),
+        artifacts: getArtifactsMode({ includeShadcnui, customPromptMode }),
       },
       convo,
     ) as TEndpointOption;
@@ -228,7 +227,6 @@ export default function useChatFunctions({
       conversationId,
       unfinished: false,
       isCreatedByUser: false,
-      isEdited: isEditOrContinue,
       iconURL: convo?.iconURL,
       model: convo?.model,
       error: false,
diff --git a/client/src/store/settings.ts b/client/src/store/settings.ts
index 901c48c2c4..9258e59c7a 100644
--- a/client/src/store/settings.ts
+++ b/client/src/store/settings.ts
@@ -42,7 +42,6 @@ const localStorageAtoms = {
   // Beta features settings
   modularChat: atomWithLocalStorage('modularChat', true),
   LaTeXParsing: atomWithLocalStorage('LaTeXParsing', true),
-  codeArtifacts: atomWithLocalStorage('codeArtifacts', false),
   includeShadcnui: atomWithLocalStorage('includeShadcnui', false),
   customPromptMode: atomWithLocalStorage('customPromptMode', false),
 
diff --git a/client/src/utils/artifacts.ts b/client/src/utils/artifacts.ts
index 69e2b91ee5..0d571a760d 100644
--- a/client/src/utils/artifacts.ts
+++ b/client/src/utils/artifacts.ts
@@ -6,17 +6,13 @@ import type {
 } from '@codesandbox/sandpack-react';
 
 export const getArtifactsMode = ({
-  codeArtifacts,
   includeShadcnui,
   customPromptMode,
 }: {
-  codeArtifacts: boolean;
   includeShadcnui: boolean;
   customPromptMode: boolean;
 }): ArtifactModes | undefined => {
-  if (!codeArtifacts) {
-    return undefined;
-  } else if (customPromptMode) {
+  if (customPromptMode) {
     return ArtifactModes.CUSTOM;
   } else if (includeShadcnui) {
     return ArtifactModes.SHADCNUI;