diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index c3dc5c6aa..66633c105 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -286,9 +286,9 @@ Also adds support for a `:sync' parameter to override `:async'."
                      (end (progn (goto-char beg) (forward-line) (org-babel-result-end))))
             (org-display-inline-images nil nil (min beg end) (max beg end)))))))
 
-  (after! python
-    (unless org-babel-python-command
-      (setq org-babel-python-command
+  (after! ob-python
+    (when (equal org-babel-python-command-nonsession "python")
+      (setq org-babel-python-command-nonsession
             (string-trim
              (concat python-shell-interpreter " "
                      (if (string-match-p "\\<i?python[23]?$" python-shell-interpreter)