diff --git a/isc_dhcp/files/dhcpd.conf b/isc_dhcp/files/dhcpd.conf
index 8cfe205..ae90ac2 100644
--- a/isc_dhcp/files/dhcpd.conf
+++ b/isc_dhcp/files/dhcpd.conf
@@ -3,15 +3,15 @@
 
 {%- if server.omapi_port is defined %}
 omapi-port {{ server.omapi_port }};
-{% endif -%}
 
-{- if server.omapi_key and server.omapi_port is defined %}
+{%- if server.omapi_key is defined %}
 key omapi_key {
  algorithm HMAC-MD5;
  secret "{{ server.omapi_key }}";
 };
 omapi-key omapi_key;
 {%- endif %}
+{%- endif %}
 
 {%- if server.ddns_updates is defined %}