diff --git a/src/Modal.js b/src/Modal.js
index 11c5d3d9c0..8d53b2da7d 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -105,7 +105,9 @@ class ModalManager {
     }
 
     createDialog(Element, props, className) {
-        Analytics.trackEvent('Modal', props && props.title ? props.title : className, 'createDialog');
+        if (props && props.title) {
+            Analytics.trackEvent('Modal', props.title, 'createDialog');
+        }
         return this.createDialogAsync((cb) => {cb(Element);}, props, className);
     }