diff --git a/wireless/ieee802154/i8sak/i8sak_get.c b/wireless/ieee802154/i8sak/i8sak_get.c
index ad3815757..eb990584d 100644
--- a/wireless/ieee802154/i8sak/i8sak_get.c
+++ b/wireless/ieee802154/i8sak/i8sak_get.c
@@ -171,7 +171,7 @@ void i8sak_get_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
             break;
         }
     }
-#if CONFIG_NET_6LOWPAN
+#ifdef CONFIG_NET_6LOWPAN
   else if (strcmp(argv[argind], "ep_port") == 0)
     {
       printf("i8sak: Endpoint Port: %d\n", NTOHS(i8sak->ep_in6addr.sin6_port));
diff --git a/wireless/ieee802154/i8sak/i8sak_set.c b/wireless/ieee802154/i8sak/i8sak_set.c
index 0de122837..656f4d387 100644
--- a/wireless/ieee802154/i8sak/i8sak_set.c
+++ b/wireless/ieee802154/i8sak/i8sak_set.c
@@ -145,7 +145,6 @@ void i8sak_set_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
           fprintf(stderr, "ERROR: invalid mode. Options: s|e\n");
           i8sak_cmd_error(i8sak);
         }
-
     }
   else if (strcmp(argv[argind], "ep_saddr") == 0)
     {
@@ -156,8 +155,8 @@ void i8sak_set_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
         {
           i8sak_update_ep_ip(i8sak);
         }
-    }
 #endif
+    }
   else if (strcmp(argv[argind], "ep_eaddr") == 0)
     {
       i8sak_str2eaddr(argv[argind + 1], i8sak->ep_addr.eaddr);
@@ -214,6 +213,7 @@ void i8sak_set_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
             {
               u.attr.phy.chan = i8sak_str2luint8(argv[argind + 1]);
               ieee802154_setchan(fd, u.attr.phy.chan);
+              i8sak->chan = u.attr.phy.chan;
             }
           else if (strcmp(argv[argind], "panid") == 0)
             {
@@ -249,6 +249,7 @@ void i8sak_set_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
             {
               u.attr.phy.chan = i8sak_str2luint8(argv[argind + 1]);
               sixlowpan_setchan(fd, i8sak->ifname, u.attr.phy.chan);
+              i8sak->chan = u.attr.phy.chan;
             }
           else if (strcmp(argv[argind], "panid") == 0)
             {