diff --git a/docs/examples/PopoverExample.jsx b/docs/examples/PopoverExample.jsx
index 4c1d03dff..74815e67e 100644
--- a/docs/examples/PopoverExample.jsx
+++ b/docs/examples/PopoverExample.jsx
@@ -24,7 +24,7 @@ class PopoverExample extends React.PureComponent {
 
   handlePlacements = (state, placement) => this.setState({ placement });
   handleThemes = (state, theme) => this.setState({ theme });
-  handleTriggers = (state, trigger) => this.setState({ trigger: state ? trigger : 'hover' });
+  handleTriggers = (state, trigger) => this.setState({ trigger });
   togglePopover = () =>
     this.setState(prevState => ({
       isOpen: !prevState.isOpen,
@@ -112,7 +112,7 @@ class PopoverExample extends React.PureComponent {
         <div className="auto-flip-container">
           <div id="popover-boundaries" className="popover-example-container">
             <Popover
-              trigger="disabled"
+              triggers="disabled"
               isOpen={true}
               placement="left"
               title="Popover Title"
@@ -144,7 +144,7 @@ const exampleProps = {
 
     // Non overflowing popover
     <Popover
-      trigger="disabled"
+      triggers="disabled"
       isOpen={true}
       placement="left"
       title="Popover Title"
diff --git a/src/components/third-party/Popover/index.jsx b/src/components/third-party/Popover/index.jsx
index 3b9926cf9..0bc4880d1 100644
--- a/src/components/third-party/Popover/index.jsx
+++ b/src/components/third-party/Popover/index.jsx
@@ -141,11 +141,11 @@ class Popover extends React.PureComponent {
               {...(triggers.includes('disabled')
                 ? {}
                 : {
-                    onClick: triggers.includes('click') ? this.onClick : null,
-                    onMouseOver: triggers.includes('hover') ? this.onMouseOver : null,
-                    onFocus: triggers.includes('focus') ? this.onFocus : null,
-                    onMouseOut: triggers.includes('hover') ? this.onMouseOut : null,
-                    onBlur: triggers.includes('focus') ? this.onBlur : null,
+                    ...(triggers.includes('click') ? { onClick: this.onClick } : {}),
+                    ...(triggers.includes('hover')
+                      ? { onMouseOver: this.onMouseOver, onMouseOut: this.onMouseOut }
+                      : {}),
+                    ...(triggers.includes('focus') ? { onFocus: this.onFocus, onBlur: this.onBlur } : {}),
                   })}
             >
               {children}
diff --git a/src/components/third-party/Popover/index.spec.jsx b/src/components/third-party/Popover/index.spec.jsx
index 11ee77dfd..be1690796 100644
--- a/src/components/third-party/Popover/index.spec.jsx
+++ b/src/components/third-party/Popover/index.spec.jsx
@@ -241,10 +241,6 @@ describe('Popover Component', () => {
         </Popover>
       );
       expect(wrapper.find('.aui--popover-element').prop('onClick')).to.be.a('function');
-      expect(wrapper.find('.aui--popover-element').prop('onMouseOver')).to.equal(null);
-      expect(wrapper.find('.aui--popover-element').prop('onFocus')).to.equal(null);
-      expect(wrapper.find('.aui--popover-element').prop('onMouseOut')).to.equal(null);
-      expect(wrapper.find('.aui--popover-element').prop('onBlur')).to.equal(null);
     });
 
     it('should register event handlers only for hover trigger', () => {
@@ -253,11 +249,8 @@ describe('Popover Component', () => {
           Test message
         </Popover>
       );
-      expect(wrapper.find('.aui--popover-element').prop('onClick')).to.equal(null);
       expect(wrapper.find('.aui--popover-element').prop('onMouseOver')).to.be.a('function');
-      expect(wrapper.find('.aui--popover-element').prop('onFocus')).to.equal(null);
       expect(wrapper.find('.aui--popover-element').prop('onMouseOut')).to.be.a('function');
-      expect(wrapper.find('.aui--popover-element').prop('onBlur')).to.equal(null);
     });
 
     it('should register event handlers only for focus trigger', () => {
@@ -266,10 +259,7 @@ describe('Popover Component', () => {
           Test message
         </Popover>
       );
-      expect(wrapper.find('.aui--popover-element').prop('onClick')).to.equal(null);
-      expect(wrapper.find('.aui--popover-element').prop('onMouseOver')).to.equal(null);
       expect(wrapper.find('.aui--popover-element').prop('onFocus')).to.be.a('function');
-      expect(wrapper.find('.aui--popover-element').prop('onMouseOut')).to.equal(null);
       expect(wrapper.find('.aui--popover-element').prop('onBlur')).to.be.a('function');
     });
 
@@ -285,9 +275,7 @@ describe('Popover Component', () => {
         </Popover>
       );
       expect(wrapper.find('.aui--popover-element').prop('onClick')).to.be.a('function');
-      expect(wrapper.find('.aui--popover-element').prop('onMouseOver')).to.equal(null);
       expect(wrapper.find('.aui--popover-element').prop('onFocus')).to.be.a('function');
-      expect(wrapper.find('.aui--popover-element').prop('onMouseOut')).to.equal(null);
       expect(wrapper.find('.aui--popover-element').prop('onBlur')).to.be.a('function');
     });