diff --git a/public/app/plugins/datasource/elasticsearch/partials/config.html b/public/app/plugins/datasource/elasticsearch/partials/config.html
index 3ec80683f8b..d959ee97ac2 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/config.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/config.html
@@ -42,7 +42,7 @@
         ng-model="ctrl.current.jsonData.timeInterval"
         spellcheck='false'
         placeholder="10s"
-        ng-pattern="/^\d+[Mwdhmsy]$/"
+        ng-pattern="/^\d+(ms|[Mwdhmsy])$/"
       ></input>
 			<info-popover mode="right-absolute">
 				A lower limit for the auto group by time interval. Recommended to be set to write frequency,
diff --git a/public/app/plugins/datasource/mssql/partials/config.html b/public/app/plugins/datasource/mssql/partials/config.html
index f8034e86b1c..3aa637e172a 100644
--- a/public/app/plugins/datasource/mssql/partials/config.html
+++ b/public/app/plugins/datasource/mssql/partials/config.html
@@ -88,7 +88,7 @@
         ng-model="ctrl.current.jsonData.timeInterval"
         spellcheck='false'
         placeholder="1m"
-        ng-pattern="/^\d+[Mwdhmsy]$/"
+        ng-pattern="/^\d+(ms|[Mwdhmsy])$/"
       ></input>
 			<info-popover mode="right-absolute">
 				A lower limit for the auto group by time interval. Recommended to be set to write frequency,
diff --git a/public/app/plugins/datasource/mysql/partials/config.html b/public/app/plugins/datasource/mysql/partials/config.html
index b754a5ab9a1..b9455b16bd8 100644
--- a/public/app/plugins/datasource/mysql/partials/config.html
+++ b/public/app/plugins/datasource/mysql/partials/config.html
@@ -88,7 +88,7 @@
         ng-model="ctrl.current.jsonData.timeInterval"
         spellcheck='false'
         placeholder="1m"
-        ng-pattern="/^\d+[Mwdhmsy]$/"
+        ng-pattern="/^\d+(ms|[Mwdhmsy])$/"
       ></input>
 			<info-popover mode="right-absolute">
 				A lower limit for the auto group by time interval. Recommended to be set to write frequency,
diff --git a/public/app/plugins/datasource/postgres/partials/config.html b/public/app/plugins/datasource/postgres/partials/config.html
index 95abc25dee7..c26d234720d 100644
--- a/public/app/plugins/datasource/postgres/partials/config.html
+++ b/public/app/plugins/datasource/postgres/partials/config.html
@@ -102,7 +102,7 @@
         ng-model="ctrl.current.jsonData.timeInterval"
         spellcheck='false'
         placeholder="1m"
-        ng-pattern="/^\d+[Mwdhmsy]$/"
+        ng-pattern="/^\d+(ms|[Mwdhmsy])$/"
       ></input>
 			<info-popover mode="right-absolute">
 				A lower limit for the auto group by time interval. Recommended to be set to write frequency,