diff --git a/bin/pyspark b/bin/pyspark
index cad982bc33477..6f2f981e06c54 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -51,13 +51,9 @@ export PYTHONPATH=$SPARK_HOME/python/:$PYTHONPATH
 export OLD_PYTHONSTARTUP=$PYTHONSTARTUP
 export PYTHONSTARTUP=$FWDIR/python/pyspark/shell.py
 
-if [ -n "$IPYTHON_OPTS" ]; then
-  IPYTHON=1
-fi
 
-# Only use ipython if no command line arguments were provided [SPARK-1134]
-if [[ "$IPYTHON" = "1" && $# = 0 ]] ; then
-  exec ipython $IPYTHON_OPTS
+if [[ "$IPYTHON" = "1" ]] ; then
+  exec ipython "$@"
 else
   exec "$PYSPARK_PYTHON" "$@"
 fi