diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 24280177c..e1118a9bc 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -310,7 +310,12 @@ Also adds support for a `:sync' parameter to override `:async'."
   (after! python
     (unless org-babel-python-command
       (setq org-babel-python-command
-            (concat python-shell-interpreter " " python-shell-interpreter-args))))
+            (string-trim
+             (concat python-shell-interpreter " "
+                     (if (string-match-p "\\<i?python[23]?$" python-shell-interpreter)
+                         (replace-regexp-in-string
+                          "\\(^\\| \\)-i\\( \\|$\\)" " " python-shell-interpreter-args)
+                       python-shell-interpreter-args))))))
 
   (after! ob-ditaa
     ;; TODO Should be fixed upstream