diff --git a/net-mgmt/snmp/Makefile b/net-mgmt/snmp/Makefile
index 14d288af8..48d0e137d 100644
--- a/net-mgmt/snmp/Makefile
+++ b/net-mgmt/snmp/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		snmp
-PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1.3
 PLUGIN_DEPENDS=		bsnmp-regex bsnmp-ucd
 PLUGIN_COMMENT=		SNMP Server via bsnmpd
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net-mgmt/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc b/net-mgmt/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc
index 382204795..b0c5885b9 100644
--- a/net-mgmt/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc
+++ b/net-mgmt/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2014-2017 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2014-2018 Franco Fichtner <franco@opnsense.org>
  * Copyright (C) 2010 Ermal Luçi
  * Copyright (C) 2005-2006 Colin Smith <ethethlay@gmail.com>
  * Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>
@@ -126,13 +126,16 @@ begemotSnmpdCommunityDisable    = 1
 
 EOD;
 
-    $bind_to_ip = "0.0.0.0";
-    if (isset($config['snmpd']['bindip'])) {
+    $bind_to_ip = '0.0.0.0';
+    if (!empty($config['snmpd']['bindip'])) {
         if (is_ipaddr($config['snmpd']['bindip'])) {
             $bind_to_ip = $config['snmpd']['bindip'];
         } else {
             $if = get_real_interface($config['snmpd']['bindip']);
-            $bind_to_ip = find_interface_ip($if);
+            $bind_to_ip_maybe = find_interface_ip($if);
+            if (is_ipaddr($bind_to_ip_maybe)) {
+                $bind_to_ip = $bind_to_ip_maybe;
+            }
         }
     }