diff --git a/client/src/App.tsx b/client/src/App.tsx
index 73a337aea..5df8f4e14 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -190,8 +190,12 @@ const App = () => {
       .then((response) => response.json())
       .then((data) => {
         setEnv(data.defaultEnvironment);
-        setCommand(data.defaultCommand);
-        setArgs(data.defaultArgs);
+        if (data.defaultCommand) {
+          setCommand(data.defaultCommand);
+        }
+        if (data.defaultArgs) {
+          setArgs(data.defaultArgs);
+        }
       })
       .catch((error) =>
         console.error("Error fetching default environment:", error),