diff --git a/java/com/android/dialer/speeddial/DisambigDialog.java b/java/com/android/dialer/speeddial/DisambigDialog.java
index 2dd43fa..868f91d 100644
--- a/java/com/android/dialer/speeddial/DisambigDialog.java
+++ b/java/com/android/dialer/speeddial/DisambigDialog.java
@@ -186,6 +186,7 @@
     PreCall.start(
         getContext(),
         new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+            .setAllowAssistedDial(true)
             .setIsVideoCall(true)
             .setIsDuoCall(channel.technology() == Channel.DUO));
     dismiss();
@@ -197,7 +198,9 @@
     }
 
     PreCall.start(
-        getContext(), new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL));
+        getContext(),
+        new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+            .setAllowAssistedDial(true));
     dismiss();
   }
 
diff --git a/java/com/android/dialer/speeddial/SpeedDialFragment.java b/java/com/android/dialer/speeddial/SpeedDialFragment.java
index f94ad7d..fc80d23 100644
--- a/java/com/android/dialer/speeddial/SpeedDialFragment.java
+++ b/java/com/android/dialer/speeddial/SpeedDialFragment.java
@@ -347,6 +347,7 @@
       PreCall.start(
           activity,
           new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+              .setAllowAssistedDial(true)
               .setIsVideoCall(channel.isVideoTechnology())
               .setIsDuoCall(channel.technology() == Channel.DUO));
     }
@@ -441,6 +442,7 @@
       PreCall.start(
           getContext(),
           new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+              .setAllowAssistedDial(true)
               .setIsVideoCall(channel.isVideoTechnology())
               .setIsDuoCall(channel.technology() == Channel.DUO));
     }
@@ -523,6 +525,7 @@
       PreCall.start(
           activity,
           new CallIntentBuilder(channel.number(), CallInitiationType.Type.SPEED_DIAL)
+              .setAllowAssistedDial(true)
               .setIsVideoCall(channel.isVideoTechnology())
               .setIsDuoCall(channel.technology() == Channel.DUO));
     }
