diff --git a/src/app/common/prompt/prompt.tsx b/src/app/common/prompt/prompt.tsx
index f602bb7a..70ea848a 100644
--- a/src/app/common/prompt/prompt.tsx
+++ b/src/app/common/prompt/prompt.tsx
@@ -115,6 +115,7 @@ class Prompt extends React.Component<{ rptr: RemotePtrType; festate: Record<stri
         }
         let branchElem = null;
         let pythonElem = null;
+        let condaElem = null;
         if (!isBlank(festate["PROMPTVAR_GITBRANCH"])) {
             let branchName = festate["PROMPTVAR_GITBRANCH"];
             branchElem = (
@@ -132,9 +133,17 @@ class Prompt extends React.Component<{ rptr: RemotePtrType; festate: Record<stri
                 </span>
             );
         }
+        if (!isBlank(festate["CONDA_DEFAULT_ENV"])) {
+            let condaEnv = festate["CONDA_DEFAULT_ENV"];
+            condaElem = (
+                <span title="conda env" className="term-prompt-python">
+                    conda:({condaEnv}){" "}
+                </span>
+            );
+        }
         return (
             <span className={cn("term-prompt", { "term-prompt-color": this.props.color })}>
-                {remoteElem} {pythonElem}
+                {remoteElem} {condaElem} {pythonElem}
                 {cwdElem} {branchElem} {rootIndicatorElem}
             </span>
         );
diff --git a/wavesrv/pkg/sstore/sstore.go b/wavesrv/pkg/sstore/sstore.go
index 7e4ba080..09dbb20c 100644
--- a/wavesrv/pkg/sstore/sstore.go
+++ b/wavesrv/pkg/sstore/sstore.go
@@ -749,6 +749,9 @@ func FeStateFromShellState(state *packet.ShellState) map[string]string {
 	if envMap["VIRTUAL_ENV"] != "" {
 		rtn["VIRTUAL_ENV"] = envMap["VIRTUAL_ENV"]
 	}
+	if envMap["CONDA_DEFAULT_ENV"] != "" {
+		rtn["CONDA_DEFAULT_ENV"] = envMap["CONDA_DEFAULT_ENV"]
+	}
 	for key, val := range envMap {
 		if strings.HasPrefix(key, "PROMPTVAR_") && envMap[key] != "" {
 			rtn[key] = val