diff --git a/plugins/checks/check-deploy b/plugins/checks/check-deploy
index d810dc524..f5513bf04 100755
--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -84,14 +84,19 @@ if [[ ! -s "${TMPDIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]];
     dokku_log_verbose "Skipping default check..."
     exit 0
   fi
-  dokku_log_verbose "For more efficient zero downtime deployments, create a file CHECKS."
-  dokku_log_verbose "See http://dokku.viewdocs.io/dokku/checks-examples.md for examples"
-  dokku_log_verbose "CHECKS file not found in container: Running simple container check..."
+
+  # We allow custom check for web instances only
+  if [[ "$DOKKU_APP_CONTAINER_TYPE" == "web" ]]; then
+    dokku_log_verbose "For more efficient zero downtime deployments, create a file CHECKS."
+    dokku_log_verbose "See http://dokku.viewdocs.io/dokku/checks-examples.md for examples"
+    dokku_log_verbose "CHECKS file not found in container: Running simple container check..."
+  else
+    dokku_log_verbose "Non web container detected: Running default container check..."
+  fi
 
   rm -rf $TMPDIR
 
   # simple default check to see if the container stuck around
-  # for more thorough checks, create a CHECKS file
   DOKKU_DEFAULT_CHECKS_WAIT="${DOKKU_DEFAULT_CHECKS_WAIT:-10}"
   dokku_log_info1 "Waiting for $DOKKU_DEFAULT_CHECKS_WAIT seconds ..."
   sleep $DOKKU_DEFAULT_CHECKS_WAIT