diff --git a/applications/luci-app-wireguard/luasrc/view/wireguard.htm b/applications/luci-app-wireguard/luasrc/view/wireguard.htm
index 855e0aad75..e1e55f55c4 100644
--- a/applications/luci-app-wireguard/luasrc/view/wireguard.htm
+++ b/applications/luci-app-wireguard/luasrc/view/wireguard.htm
@@ -182,6 +182,17 @@
 <h2>WireGuard Status</h2>
 
 <div class="cbi-section">
+
+<% if next(data) == nil then %>
+	<div class="table cbi-section-table">
+		<div class="tr cbi-section-table-row">
+			<p>
+				<em><%:This section contains no values yet%></em>
+			</p>
+		</div>
+	</div>
+<% end %>
+
 <%-
 local ikey, iface
 for ikey, iface in pairs(data) do