diff --git a/tensorboard/components/tf_categorization_utils/tf-category-pane.html b/tensorboard/components/tf_categorization_utils/tf-category-pane.html
index b581dea5ebe..8d95de65bf7 100644
--- a/tensorboard/components/tf_categorization_utils/tf-category-pane.html
+++ b/tensorboard/components/tf_categorization_utils/tf-category-pane.html
@@ -50,7 +50,11 @@
         </span>
         <span class="count"><span>[[_count]]</span></span>
       </button>
-      <iron-collapse opened="[[opened]]">
+      <!-- TODO(stephanwlee): investigate further. For some reason,
+        transitionend that the iron-collapse relies on sometimes does not
+        trigger when rendering a chart with a spinner. A toy example cannot
+        reproduce this bug. -->
+      <iron-collapse opened="[[opened]]" no-animation>
         <div class="content">
           <template is="dom-if" if="[[opened]]" restamp="[[restamp]]"
                     id="ifOpened">
diff --git a/tensorboard/components/tf_line_chart_data_loader/data-loader-behavior.ts b/tensorboard/components/tf_line_chart_data_loader/data-loader-behavior.ts
index bc7bc5f72d1..36d27e34b3c 100644
--- a/tensorboard/components/tf_line_chart_data_loader/data-loader-behavior.ts
+++ b/tensorboard/components/tf_line_chart_data_loader/data-loader-behavior.ts
@@ -124,7 +124,8 @@ export const DataLoaderBehavior = {
 
     if (!this.isAttached) return;
     this._loadDataAsync = this.async(() => {
-      this.dataLoading = true;
+      // Read-only property have a special setter.
+      this._setDataLoading(true);
 
       // Before updating, cancel any network-pending updates, to
       // prevent race conditions where older data stomps newer data.
@@ -144,7 +145,8 @@ export const DataLoaderBehavior = {
       });
 
       return Promise.all(promises).then(this._canceller.cancellable(result => {
-        this.dataLoading = false;
+        // Read-only property have a special setter.
+        this._setDataLoading(false);
         if (result.cancelled) return;
         this.onLoadFinish();
       }));