diff --git a/frontend/src/lib/components/InfiniteList.svelte b/frontend/src/lib/components/InfiniteList.svelte
index 4777efaf06..6457d5ea60 100644
--- a/frontend/src/lib/components/InfiniteList.svelte
+++ b/frontend/src/lib/components/InfiniteList.svelte
@@ -83,16 +83,17 @@
 					}))
 				}
 			}, 2000)
-
-			page = Math.ceil(items.length / perPage)
-			hasMore = items.length === perPage * page
-			if (hasMore) {
-				const potentialNewItems = await loadInputs(page + 1, perPage)
-				hasMore = potentialNewItems.length > 0
+			if (items) {
+				page = Math.ceil(items.length / perPage)
+				hasMore = items.length === perPage * page
+				if (hasMore) {
+					const potentialNewItems = await loadInputs(page + 1, perPage)
+					hasMore = potentialNewItems.length > 0
+				}
+				initLoad = true
+				isEmpty = items.length === 0
+				length = items.length
 			}
-			initLoad = true
-			isEmpty = items.length === 0
-			length = items.length
 		} catch (err) {
 			console.error(err)
 			if (hasAlreadyFailed) return
diff --git a/frontend/src/lib/components/triggers/mqtt/MqttEditorConfigSection.svelte b/frontend/src/lib/components/triggers/mqtt/MqttEditorConfigSection.svelte
index 0e1ad9c039..b2c11571ae 100644
--- a/frontend/src/lib/components/triggers/mqtt/MqttEditorConfigSection.svelte
+++ b/frontend/src/lib/components/triggers/mqtt/MqttEditorConfigSection.svelte
@@ -144,7 +144,7 @@
 									</div>
 									<input
 										type="text"
-										bind:value={v.topic}
+										bind:value={subscribe_topics[i].topic}
 										disabled={!can_write}
 										placeholder="topic"
 										autocomplete="off"