diff --git a/conf/defaults.ini b/conf/defaults.ini
index bbd61c66c62..939a92bd007 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -67,6 +67,7 @@ type = sqlite3
 host = 127.0.0.1:3306
 name = grafana
 user = root
+# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
 password =
 # Use either URL or the previous fields to configure the database
 # Example: mysql://user:secret@host:port/database
diff --git a/conf/sample.ini b/conf/sample.ini
index d48c4a270c5..57f7415de44 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -69,6 +69,7 @@
 ;host = 127.0.0.1:3306
 ;name = grafana
 ;user = root
+# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
 ;password =
 
 # Use either URL or the previous fields to configure the database
diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md
index f3b40b206bf..838be7f168e 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/installation/configuration.md
@@ -170,7 +170,7 @@ The database user (not applicable for `sqlite3`).
 
 ### password
 
-The database user's password (not applicable for `sqlite3`).
+The database user's password (not applicable for `sqlite3`). If the password contains `#` or `;` you have to wrap it with trippel quotes. Ex `"""#password;"""`
 
 ### ssl_mode