diff --git a/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-dashboard.html b/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-dashboard.html
index 98892cf0c2..5db0820ef9 100644
--- a/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-dashboard.html
+++ b/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-dashboard.html
@@ -147,7 +147,7 @@
             value="{{_FPS}}"
             type="number"
             step="1"
-            min="1"
+            min="0"
             max="30"
             pin="true"
             disabled="[[_controls_disabled]]">
@@ -213,7 +213,7 @@ <h3>No Beholder data was found.</h3>
         </template>
 
         <template is="dom-if" if="[[_is_active]]">
-          <tf-beholder-video id="video"></tf-beholder-video>
+          <tf-beholder-video id="video" fps="[[_FPS]]"></tf-beholder-video>
 
           <template is="dom-if" if="[[_valuesNotFrame(_values)]]">
             <tf-beholder-info
diff --git a/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-info.html b/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-info.html
index f6f49e806b..7d681059e5 100644
--- a/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-info.html
+++ b/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-info.html
@@ -57,6 +57,7 @@
         fps: {  // Not actually FPS!
           type: Number,
           value: 10,
+          observer: '_fpsChanged',
         },
 
         xhrTimeout: {
@@ -124,6 +125,13 @@
         }
       },
 
+      _fpsChanged(newValue, oldValue) {
+        if (newValue == 0) {
+          this._clear();
+        } else if (oldValue == 0) {
+          this._load();
+        }
+      },
     });
     })();
   </script>
diff --git a/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-video.html b/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-video.html
index dc38dce40b..0e9f2df397 100644
--- a/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-video.html
+++ b/tensorboard/plugins/beholder/tf_beholder_dashboard/tf-beholder-video.html
@@ -44,6 +44,13 @@
     Polymer({
       is: "tf-beholder-video",
       properties: {
+        // Only used for determining ping frequency.
+        fps: {
+          type: Number,
+          value: 10,
+          observer: '_fpsChanged',
+        },
+
         pingSleep: {
           type: Number,
           value: 1000,
@@ -90,7 +97,7 @@
           const response = JSON.parse(this._xhr.responseText);
           this._onPing(response['status'] == 'alive', this.pingSleep);
           return;
-        } 
+        }
         this._onPing(false, this.pingSleep);
       },
 
@@ -115,6 +122,13 @@
         }
       },
 
+      _fpsChanged(newValue, oldValue) {
+        if (newValue == 0) {
+          this._clear();
+        } else if (oldValue == 0) {
+          this._ping();
+        }
+      },
     });
 
     })();