diff --git a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/DeviceTaskExecutor.java b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/DeviceTaskExecutor.java
index 6f90256fd8..30e754abdd 100644
--- a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/DeviceTaskExecutor.java
+++ b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/DeviceTaskExecutor.java
@@ -75,15 +75,22 @@ class DeviceTaskExecutor<T extends Enum> {
                     return new TaskQueue();
                 }
             });
+    /**
+     * Type of tasks allowed to be back to back.
+     */
+    private final Set<T> allowList;
 
     /**
-     * Creates a new executor with the given delegate executor service.
+     * Creates a new executor with the given delegate executor service
+     * and the allowed back to back task types.
      *
      * @param delegate executor service
+     * @param allowed tasks allowed to be back to back
      */
-    DeviceTaskExecutor(ExecutorService delegate) {
+    DeviceTaskExecutor(ExecutorService delegate, Set<T> allowed) {
         checkNotNull(delegate);
         this.delegate = delegate;
+        this.allowList = allowed;
     }
 
     /**
@@ -108,7 +115,7 @@ class DeviceTaskExecutor<T extends Enum> {
         final DeviceTask task = new DeviceTask(deviceId, type, runnable);
         deviceLocks.get(deviceId).lock();
         try {
-            if (taskQueues.get(deviceId).isBackToBackDuplicate(type)) {
+            if (taskQueues.get(deviceId).isBackToBackDuplicate(type) && !allowList.contains(type)) {
                 if (log.isDebugEnabled()) {
                     log.debug("Dropping back-to-back duplicate task {} for {}",
                               type, deviceId);
diff --git a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
index 78ab98a4f1..f684d31e80 100644
--- a/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
+++ b/providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
@@ -204,7 +204,7 @@ public class GeneralDeviceProvider extends AbstractProvider
     public void activate(ComponentContext context) {
         mainExecutor = newFixedThreadPool(CORE_POOL_SIZE, groupedThreads(
                 "onos/gdp", "%d", log));
-        taskExecutor = new DeviceTaskExecutor<>(mainExecutor);
+        taskExecutor = new DeviceTaskExecutor<>(mainExecutor, GDP_ALLOWLIST);
         providerService = providerRegistry.register(this);
         componentConfigService.registerProperties(getClass());
         coreService.registerApplication(APP_NAME);
@@ -587,6 +587,9 @@ public class GeneralDeviceProvider extends AbstractProvider
         NOT_MASTER,
     }
 
+    private static final Set<TaskType> GDP_ALLOWLIST = Sets.newHashSet(TaskType.ROLE_MASTER, TaskType.ROLE_NONE,
+            TaskType.ROLE_STANDBY, TaskType.NOT_MASTER);
+
     private void submitTask(DeviceId deviceId, TaskType taskType) {
         taskExecutor.submit(deviceId, taskType, taskRunnable(deviceId, taskType));
     }