diff --git a/dispatchers/Html.php b/dispatchers/Html.php
index 6c82b4bfd..ca5fc4cbc 100644
--- a/dispatchers/Html.php
+++ b/dispatchers/Html.php
@@ -237,10 +237,10 @@ public function enqueue_assets() {
 		// Only load if the wp-admin bar is visible.
 		if ( is_admin_bar_showing() ) {
 			wp_enqueue_script(
-				'web-vitals',
+				'qm-web-vitals',
 				$this->qm->plugin_url( 'assets/web-vitals.js' ),
 				array(),
-				QM_VERSION,
+				'3.3.2',
 				true
 			);
 		}
diff --git a/output/html/web_vitals.php b/output/html/web_vitals.php
index f3241a38b..674a3d7ef 100644
--- a/output/html/web_vitals.php
+++ b/output/html/web_vitals.php
@@ -34,6 +34,15 @@ public function name() {
 	 * @return void
 	 */
 	public function output() {
+		if ( ! wp_script_is( 'qm-web-vitals', 'enqueued' ) && ! wp_script_is( 'qm-web-vitals', 'done' ) ) {
+			$this->before_non_tabular_output();
+			/* translators: %s: Script handle. */
+			$notice = sprintf( __( 'Script %s is not available.', 'query-monitor' ), 'qm-web-vitals' );
+			echo $this->build_notice( $notice );
+			$this->after_non_tabular_output();
+			return;
+		}
+
 		$this->before_tabular_output();
 		echo '<thead>';
 
@@ -47,19 +56,24 @@ public function output() {
 		echo '</thead>';
 
 		echo '<tbody id="qm-web-vitals-inner">';
+			echo '<tr class="waiting">';
+				echo '<td colspan="4">';
+					echo '<div class="qm-none"><p>Waiting for data...</p></div>';
+				echo '</td>';
+			echo '</tr>';
 		echo '</tbody>';
 
 		$this->after_tabular_output();
 		echo '<script>
 		// Insert the web vital into the qm-web-vitals div.
 		function insertWebVital( webVital ) {
-			console.log( { webVital } );
 			var webVitalsDiv = document.getElementById( "qm-web-vitals-inner" );
 			var divToAdd = document.createElement("tr");
 			divToAdd.innerHTML = "<td>" + webVital.name + "</td>" +
 				"<td>" + webVital.value + "</td>" +
 				"<td>" + webVital.rating + "</td>" +
 				"<td><pre class=\"qm-pre-wrap\"><code>" + JSON.stringify( webVital ) + "</code></pre></td>";
+			webVitalsDiv.querySelector( ".waiting" )?.remove();
 			webVitalsDiv.appendChild( divToAdd );
 		}