diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index 6c9ba5a5b..f29e4d67e 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -24,6 +24,13 @@ if ($inet6support) {
 if ($inet6support) {
    $inet6support = eval { require IO::Socket::SSL; IO::Socket::SSL->import('inet6'); 1;};
 }
+
+# Is IPv6 enabled on the MN or xCAT client at all?
+my $ipv6enabled = `ip addr | grep inet6`;
+if (!$ipv6enabled) {
+    $inet6support = 0;
+}
+
 unless ($inet6support) {
   eval { require Socket };
   eval { require IO::Socket::INET };
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 484296277..70b9ff1cb 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -64,6 +64,13 @@ if ($inet6support) {
 if ($inet6support) {
    $inet6support = eval { require IO::Socket::SSL; IO::Socket::SSL->import('inet6'); 1; };
 } 
+
+# Is IPv6 enabled on the MN or SN at all?
+my $ipv6enabled = `ip addr | grep inet6`;
+if (!$ipv6enabled) {
+    $inet6support = 0;
+}
+
 unless ($inet6support) {
   eval { require Socket };
   eval { require IO::Socket::INET };