diff --git a/plugins/00_dokku-standard/subcommands/run b/plugins/00_dokku-standard/subcommands/run
index 8041be46c..b5a4ec6cb 100755
--- a/plugins/00_dokku-standard/subcommands/run
+++ b/plugins/00_dokku-standard/subcommands/run
@@ -9,7 +9,7 @@ dokku_run_cmd() {
   verify_app_name "$APP"
   shift 2
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-run "$DOKKU_SCHEDULER" "$APP" "$@"
 }
 
diff --git a/plugins/apps/functions b/plugins/apps/functions
index 24d8d7ee4..598dd87f2 100755
--- a/plugins/apps/functions
+++ b/plugins/apps/functions
@@ -36,7 +36,7 @@ apps_destroy() {
   echo "Destroying $APP (including all add-ons)"
   plugn trigger pre-delete "$APP" "$IMAGE_TAG"
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   local REMOVE_CONTAINERS="true"
   plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP" "$REMOVE_CONTAINERS"
   plugn trigger post-delete "$APP" "$IMAGE_TAG"
@@ -63,4 +63,4 @@ apps_maybe_create() {
       suppress_output apps_create "$APP"
     fi
   fi
-}
\ No newline at end of file
+}
diff --git a/plugins/common/functions b/plugins/common/functions
index 926d7a7af..562ee1310 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -221,6 +221,22 @@ get_app_image_name() {
   echo "$IMAGE"
 }
 
+get_app_scheduler() {
+  declare desc="fetch the scheduler for a given application"
+  declare APP="$1"
+  local DOKKU_SCHEDULER
+
+  DOKKU_APP_SCHEDULER="$(config_get "$APP" DOKKU_SCHEDULER || true)"
+  DOKKU_GLOBAL_SCHEDULER="$(config_get --global DOKKU_SCHEDULER || true)"
+
+  DOKKU_SCHEDULER=${DOKKU_APP_SCHEDULER:="$DOKKU_GLOBAL_SCHEDULER"}
+  if [[ -z "$DOKKU_SCHEDULER" ]]; then
+    DOKKU_SCHEDULER="docker-local"
+  fi
+
+  echo "$DOKKU_SCHEDULER"
+}
+
 get_running_image_tag() {
   declare desc="retrieve current image tag for a given app. returns empty string if no deployed containers are found"
   local APP="$1"
@@ -559,7 +575,7 @@ dokku_deploy_cmd() {
   declare APP="$1" IMAGE_TAG="$2"
   source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-deploy "$DOKKU_SCHEDULER" "$APP" "$IMAGE_TAG"
 }
 
@@ -633,8 +649,7 @@ docker_cleanup() {
   fi
 
   dokku_log_info1 "Cleaning up..."
-  local DOKKU_SCHEDULER="docker-local"
-  [[ -n "$APP" ]] && DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-docker-cleanup "$DOKKU_SCHEDULER" "$APP" "$FORCE_CLEANUP"
 
   # delete all non-running containers
diff --git a/plugins/logs/subcommands/failed b/plugins/logs/subcommands/failed
index a064ea6b7..3c9efdecc 100755
--- a/plugins/logs/subcommands/failed
+++ b/plugins/logs/subcommands/failed
@@ -26,7 +26,7 @@ fn-logs-failed-single() {
   local DOKKU_SCHEDULER
 
   dokku_log_info2_quiet "${APP} failed deploy logs"
-  DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-logs-failed "$DOKKU_SCHEDULER" "$APP"
 }
 
diff --git a/plugins/ps/functions b/plugins/ps/functions
index 60604924f..cbb1793c6 100755
--- a/plugins/ps/functions
+++ b/plugins/ps/functions
@@ -119,7 +119,7 @@ ps_stop() {
   ! (is_deployed "$APP") && dokku_log_warn "App $APP has not been deployed" && exit 0
 
   dokku_log_quiet "Stopping $APP ..."
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP"
   plugn trigger post-stop "$APP"
 }
@@ -208,4 +208,4 @@ fn-ps-is-app-running() {
   declare APP="$1"
   APP_STATUS=$(fn-ps-app-status "$APP")
   echo "$APP_STATUS" | cut -d ' ' -f 2
-}
\ No newline at end of file
+}
diff --git a/plugins/ps/subcommands/restore b/plugins/ps/subcommands/restore
index 7103f59d8..bbfa86f82 100755
--- a/plugins/ps/subcommands/restore
+++ b/plugins/ps/subcommands/restore
@@ -10,11 +10,7 @@ ps_restore_cmd() {
   local APP="$2"
   local DOKKU_SCHEDULER
 
-  DOKKU_SCHEDULER=$(config_get --global DOKKU_SCHEDULER || echo "docker-local")
-  if [[ -n "$APP" ]]; then
-    DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
-  fi
-
+  DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger pre-restore "$DOKKU_SCHEDULER"
 
   if [[ -n "$APP" ]]; then
diff --git a/plugins/scheduler-docker-local/check-deploy b/plugins/scheduler-docker-local/check-deploy
index cae18ef5a..bbced03f6 100755
--- a/plugins/scheduler-docker-local/check-deploy
+++ b/plugins/scheduler-docker-local/check-deploy
@@ -43,7 +43,7 @@ scheduler-docker-local-check-deploy() {
   local trigger="scheduler-docker-local-check-deploy"
   local APP="$1"; local DOKKU_APP_CONTAINER_ID="$2"; local DOKKU_APP_CONTAINER_TYPE="$3"; local DOKKU_APP_LISTEN_PORT="$4"; local DOKKU_APP_LISTEN_IP="$5"
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
     return
   fi
diff --git a/plugins/scheduler-docker-local/core-post-deploy b/plugins/scheduler-docker-local/core-post-deploy
index 793c65dfa..f052097fe 100755
--- a/plugins/scheduler-docker-local/core-post-deploy
+++ b/plugins/scheduler-docker-local/core-post-deploy
@@ -9,7 +9,7 @@ scheduler-docker-local-core-post-deploy() {
   declare APP="$1";
   local APP_ROOT="$DOKKU_ROOT/$APP"
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
     return
   fi
diff --git a/plugins/scheduler-docker-local/post-delete b/plugins/scheduler-docker-local/post-delete
index fe180e91a..39f753f93 100755
--- a/plugins/scheduler-docker-local/post-delete
+++ b/plugins/scheduler-docker-local/post-delete
@@ -8,7 +8,7 @@ scheduler-docker-local-post-delete() {
   declare trigger="scheduler-docker-local post-delete"
   declare APP="$1"
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
     return
   fi
diff --git a/plugins/scheduler-docker-local/pre-deploy b/plugins/scheduler-docker-local/pre-deploy
index 68473c25a..cb0f6f378 100755
--- a/plugins/scheduler-docker-local/pre-deploy
+++ b/plugins/scheduler-docker-local/pre-deploy
@@ -11,7 +11,7 @@ scheduler-docker-local-pre-deploy() {
   local IMAGE DISABLE_CHOWN DOCKER_ARGS DOKKU_APP_TYPE DOKKU_APP_USER APP_PATHS CONTAINER_PATHS
   declare -a ARG_ARRAY
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
     return
   fi
diff --git a/plugins/tags/subcommands/create b/plugins/tags/subcommands/create
index 2a90f8c8c..6c0286d15 100755
--- a/plugins/tags/subcommands/create
+++ b/plugins/tags/subcommands/create
@@ -10,7 +10,7 @@ tags_create_cmd() {
   local APP="$2"; local IMAGE_TAG="$3"; local IMAGE_REPO=$(get_app_image_repo "$APP")
   verify_app_name "$APP"
 
-  local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+  local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
   plugn trigger scheduler-tags-create "$DOKKU_SCHEDULER" "$APP" "$IMAGE_REPO:latest" "$IMAGE_REPO:$IMAGE_TAG"
 
   dokku_log_info2_quiet "Added $IMAGE_TAG tag to $IMAGE_REPO"
diff --git a/plugins/tags/subcommands/destroy b/plugins/tags/subcommands/destroy
index 5a8293c4a..1b285641f 100755
--- a/plugins/tags/subcommands/destroy
+++ b/plugins/tags/subcommands/destroy
@@ -16,7 +16,7 @@ tags_destroy_cmd() {
       ;;
 
     *)
-      local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local")
+      local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")
       plugn trigger scheduler-tags-destroy "$DOKKU_SCHEDULER" "$APP" "$IMAGE_REPO" "$IMAGE_TAG"
       ;;
   esac