diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
index 940025a7c06df..82e69d0aa6538 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosClusterScheduler.scala
@@ -424,7 +424,9 @@ private[spark] class MesosClusterScheduler(
       "--driver-memory", s"${desc.mem}M")
 
     val replicatedOptionsBlacklist = Set(
-      "spark.jars" // Avoids duplicate classes in classpath
+      "spark.jars", // Avoids duplicate classes in classpath
+      "spark.submit.deployMode", // this would be set to `cluster`, but we need client
+      "spark.master" // this contains the address of the dispatcher, not master
     )
 
     // Assume empty main class means we're running python