diff --git a/ui/src/shared/components/DatabaseList.js b/ui/src/shared/components/DatabaseList.js
index 6300e81542..79340ddd27 100644
--- a/ui/src/shared/components/DatabaseList.js
+++ b/ui/src/shared/components/DatabaseList.js
@@ -49,9 +49,12 @@ const DatabaseList = React.createClass({
     const {querySource: nextSource, query: nextQuery} = this.props
     const differentSource = !_.isEqual(prevSource, nextSource)
 
+    if (prevQuery.rawText === nextQuery.rawText) {
+      return
+    }
+
     const newMetaQuery =
-      prevQuery.rawText !== nextQuery.rawText &&
-      nextQuery.rawText.match(/^(create|drop)/i)
+      nextQuery.rawText && nextQuery.rawText.match(/^(create|drop)/i)
 
     if (differentSource || newMetaQuery) {
       setTimeout(this.getDbRp, 100)