diff --git a/server/config_init.c b/server/config_init.c
index 225290aa..36bf2511 100644
--- a/server/config_init.c
+++ b/server/config_init.c
@@ -1031,6 +1031,16 @@ validate_options(fko_srv_options_t *opts)
         clean_exit(opts, NO_FW_CLEANUP, EXIT_FAILURE);
     }
 
+#if FIREWALL_IPTABLES
+    if(opts->config[CONF_FIREWALL_EXE_IPV6] == NULL)
+    {
+        log_msg(LOG_ERR,
+            "[*] No firewall command executable is set for IPv6. Please check FIREWALL_EXE_IPV6 in fwknopd.conf."
+        );
+        clean_exit(opts, NO_FW_CLEANUP, EXIT_FAILURE);
+    }
+#endif
+
     return;
 }
 
@@ -1048,6 +1058,9 @@ set_preconfig_entries(fko_srv_options_t *opts)
 #ifdef FIREWALL_EXE
     set_config_entry(opts, CONF_FIREWALL_EXE, FIREWALL_EXE);
 #endif
+#ifdef FIREWALL_EXE_IPV6
+    set_config_entry(opts, CONF_FIREWALL_EXE_IPV6, FIREWALL_EXE_IPV6);
+#endif
 
 }