diff --git a/plugins/nextcloud/nextcloud_ b/plugins/nextcloud/nextcloud_
index bf431b44..f5d30cf9 100755
--- a/plugins/nextcloud/nextcloud_
+++ b/plugins/nextcloud/nextcloud_
@@ -73,18 +73,24 @@ if [ "${MUNIN_DEBUG:-0}" = 1 ]; then
 fi
 
 CHECK_APP_UPDATES="${check_app_updates:-true}"
+APP_UPDATES_CONFIG=""
+APP_UPDATES_VALUE=""
 API_PATH="${api_path:-/ocs/v2.php/apps/serverinfo/api/v1/info}?format=json&skipApps=$check_app_updates"
 DOMAIN="${0##*nextcloud_}"
 SCHEME="${scheme:-https}://"
 TIMEOUT="${timeout:-2}"
-UPDATES_WARNING="${updates_warning:-1}"
 CLEANDOMAIN="$(clean_fieldname "${DOMAIN}")"
 
-if [ "$CHECK_APP_UPDATES" = "false" ]; then
-	UPDATES_WARNING="-1"
+if [ "$CHECK_APP_UPDATES" != "false" ]; then
+	UPDATES_WARNING="${updates_warning:-1}"
+	APP_UPDATES_CONFIG="num_updates_available.label available app updates
+num_updates_available.info number of available app updates
+num_updates_available.min 0
+num_updates_available.warning ${UPDATES_WARNING}"
+	APP_UPDATES_VALUE="num_updates_available.value \(.nextcloud.system.apps.num_updates_available)"
 fi
 
-SERVERINFO_TOKEN="${serverinfo_token}"
+SERVERINFO_TOKEN="${serverinfo_token:-}"
 if [ -z "${SERVERINFO_TOKEN}" ]; then
 	USERNAME="${username:-}"
 	PASSWORD="${password:-}"
@@ -214,10 +220,7 @@ graph_printf %.0lf
 graph_vlabel apps
 graph_info number of installed and updatable apps
 graph_category cloud
-num_updates_available.label available app updates
-num_updates_available.info number of available app updates
-num_updates_available.min 0
-num_updates_available.warning ${UPDATES_WARNING}
+$APP_UPDATES_CONFIG
 num_installed.label installed apps
 num_installed.info number of installed apps
 num_installed.min 0
@@ -263,6 +266,6 @@ db_size.value \(.server.database.size)
 
 multigraph nextcloud_apps_'"${CLEANDOMAIN}"'
 num_installed.value \(.nextcloud.system.apps.num_installed)
-num_updates_available.value \(.nextcloud.system.apps.num_updates_available)
+'"$APP_UPDATES_VALUE"'
 "' \
 	| sed 's/ null$/ U/'