diff --git a/google-client-loader.html b/google-client-loader.html
index 0f4168a..d314470 100644
--- a/google-client-loader.html
+++ b/google-client-loader.html
@@ -143,7 +143,11 @@
         if (!this.shadowRoot) { this.attachShadow({mode: 'open'}); }
         this.shadowRoot.appendChild(this._loader);
 
-        this.listen(this._loader, 'js-api-load', '_loadClient');
+        if (this._loader.libraryLoaded) {
+          this._loadClient();
+        } else {
+          this.listen(this._loader, 'js-api-load', '_loadClient');
+        }
       },
 
       detached: function() {