diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c1b603da71454..479956a4ddfe5 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -666,7 +666,7 @@
 		 * @param {string} [tabId] optional tab id to select
 		 */
 		showDetailsView: function(fileName, tabId) {
-			console.debug('showDetailsView is deprecated! Use OCA.Files.Sidebar.activeTab. It will be removed in nextcloud 20.');
+			OC.debug && console.debug('showDetailsView is deprecated! Use OCA.Files.Sidebar.activeTab. It will be removed in nextcloud 20.');
 			this._updateDetailsView(fileName);
 			if (tabId) {
 				OCA.Files.Sidebar.setActiveTab(tabId);
@@ -3879,7 +3879,7 @@
 		 * Register a tab view to be added to all views
 		 */
 		registerTabView: function(tabView) {
-			console.debug('registerTabView is deprecated! It will be removed in nextcloud 20.');
+			OC.debug && console.debug('registerTabView is deprecated! It will be removed in nextcloud 20.');
 			const enabled = tabView.canDisplay || undefined
 			if (tabView.id) {
 				OCA.Files.Sidebar.registerTab(new OCA.Files.Sidebar.Tab({
@@ -3905,7 +3905,7 @@
 		 * Register a detail view to be added to all views
 		 */
 		registerDetailView: function(detailView) {
-			console.debug('registerDetailView is deprecated! It will be removed in nextcloud 20.');
+			OC.debug && console.debug('registerDetailView is deprecated! It will be removed in nextcloud 20.');
 			if (detailView.el) {
 				OCA.Files.Sidebar.registerSecondaryView(detailView)
 			}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index f37ad88c86ad0..7ce9079760fed 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -281,7 +281,7 @@
 		 * @deprecated used OCA.Files.FileList.generatePreviewUrl instead
 		 */
 		generatePreviewUrl: function(urlSpec) {
-			console.debug('DEPRECATED: please use generatePreviewUrl() from an OCA.Files.FileList instance');
+			OC.debug && console.debug('DEPRECATED: please use generatePreviewUrl() from an OCA.Files.FileList instance');
 			return OCA.Files.App.fileList.generatePreviewUrl(urlSpec);
 		},
 
@@ -290,7 +290,7 @@
 		 * @deprecated used OCA.Files.FileList.lazyLoadPreview instead
 		 */
 		lazyLoadPreview : function(path, mime, ready, width, height, etag) {
-			console.debug('DEPRECATED: please use lazyLoadPreview() from an OCA.Files.FileList instance');
+			OC.debug && console.debug('DEPRECATED: please use lazyLoadPreview() from an OCA.Files.FileList instance');
 			return FileList.lazyLoadPreview({
 				path: path,
 				mime: mime,
diff --git a/apps/files_sharing/src/services/ExternalLinkActions.js b/apps/files_sharing/src/services/ExternalLinkActions.js
index bef668ae29865..f91bbd25ad2d4 100644
--- a/apps/files_sharing/src/services/ExternalLinkActions.js
+++ b/apps/files_sharing/src/services/ExternalLinkActions.js
@@ -30,7 +30,7 @@ export default class ExternalLinkActions {
 
 		// init default values
 		this._state.actions = []
-		console.debug('OCA.Sharing.ExternalLinkActions initialized')
+		OC.debug && console.debug('OCA.Sharing.ExternalLinkActions initialized')
 	}
 
 	/**
diff --git a/core/src/OC/capabilities.js b/core/src/OC/capabilities.js
index fffed92dede78..8fc21abf36948 100644
--- a/core/src/OC/capabilities.js
+++ b/core/src/OC/capabilities.js
@@ -32,6 +32,6 @@ import { getCapabilities as realGetCapabilities } from '@nextcloud/capabilities'
  * @since 14.0.0
  */
 export const getCapabilities = () => {
-	console.debug('OC.getCapabilities is deprecated and will be removed in Nextcloud 21. See @nextcloud/capabilities')
+	OC.debug && console.debug('OC.getCapabilities is deprecated and will be removed in Nextcloud 21. See @nextcloud/capabilities')
 	return realGetCapabilities()
 }
diff --git a/core/src/OC/util.js b/core/src/OC/util.js
index db6b0eccae03c..42ac73ef07db7 100644
--- a/core/src/OC/util.js
+++ b/core/src/OC/util.js
@@ -124,7 +124,7 @@ export default {
 	 */
 	formatDate(timestamp, format) {
 		if (window.TESTING === undefined) {
-			console.debug('OC.Util.formatDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
+			OC.debug && console.debug('OC.Util.formatDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
 		}
 		format = format || 'LLL'
 		return moment(timestamp).format(format)
@@ -136,7 +136,7 @@ export default {
 	 */
 	relativeModifiedDate(timestamp) {
 		if (window.TESTING === undefined) {
-			console.debug('OC.Util.relativeModifiedDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
+			OC.debug && console.debug('OC.Util.relativeModifiedDate is deprecated and will be removed in Nextcloud 21. See @nextcloud/moment')
 		}
 		const diff = moment().diff(moment(timestamp))
 		if (diff >= 0 && diff < 45000) {
diff --git a/core/src/OCA/search.js b/core/src/OCA/search.js
index e206e04f4b7db..81a86a0424761 100644
--- a/core/src/OCA/search.js
+++ b/core/src/OCA/search.js
@@ -26,7 +26,7 @@ export default class Search {
 	 * @deprecated 20.0.0, will be removed in Nextcloud 22
 	 */
 	constructor() {
-		console.debug('OCA.Search is deprecated. Please use the unified search API instead')
+		OC.debug && console.debug('OCA.Search is deprecated. Please use the unified search API instead')
 	}
 
 }
diff --git a/core/src/globals.js b/core/src/globals.js
index dcad2bcdbf66a..61ad3921999b5 100644
--- a/core/src/globals.js
+++ b/core/src/globals.js
@@ -56,7 +56,7 @@ import { getToken as getRequestToken } from './OC/requesttoken.js'
 
 const warnIfNotTesting = function() {
 	if (window.TESTING === undefined) {
-		console.debug.apply(console, arguments)
+		OC.debug && console.debug.apply(console, arguments)
 	}
 }
 
diff --git a/core/src/jquery/placeholder.js b/core/src/jquery/placeholder.js
index d91c94c18acfa..b77692fdf3969 100644
--- a/core/src/jquery/placeholder.js
+++ b/core/src/jquery/placeholder.js
@@ -140,7 +140,7 @@ const toRgb = (s) => {
 }
 
 String.prototype.toRgb = function() {
-	console.debug('String.prototype.toRgb is deprecated! It will be removed in Nextcloud 22.')
+	OC.debug && console.debug('String.prototype.toRgb is deprecated! It will be removed in Nextcloud 22.')
 
 	return toRgb(this)
 }