diff --git a/firmware/0x02000.bin b/firmware/0x02000.bin
index 92528c3..a38c991 100644
Binary files a/firmware/0x02000.bin and b/firmware/0x02000.bin differ
diff --git a/firmware/0x82000.bin b/firmware/0x82000.bin
index 2b29ec9..95d7c01 100644
Binary files a/firmware/0x82000.bin and b/firmware/0x82000.bin differ
diff --git a/firmware/sha1sums b/firmware/sha1sums
index 0f0e890..454d74f 100644
--- a/firmware/sha1sums
+++ b/firmware/sha1sums
@@ -1,3 +1,3 @@
-04bc6d1e7f99ef793c3f56b83178a4698f59c99d  firmware/0x02000.bin
-ef24b0922772f704dbb8b9c8366c82cd95eff661  firmware/0x82000.bin
+684ee1679e4b869d2700691c8dc7c704d0957da6  firmware/0x02000.bin
+d70f9ff314272b56318c0da51c8ac0ffdbda4b6c  firmware/0x82000.bin
 9bd7d25204d71b3db5f35e0b2def8a6aaa7f765c  firmware/0x00000.bin
diff --git a/user/user_config.h b/user/user_config.h
index 4fb856b..11783bc 100644
--- a/user/user_config.h
+++ b/user/user_config.h
@@ -1,7 +1,7 @@
 #ifndef _USER_CONFIG_
 #define _USER_CONFIG_
 
-#define		ESP_REPEATER_VERSION "V2.2.12"
+#define		ESP_REPEATER_VERSION "V2.2.13"
 
 #define		LOCAL_ACCESS 0x01
 #define		REMOTE_ACCESS 0x02
diff --git a/user/user_main.c b/user/user_main.c
index 93b8510..e4e6273 100644
--- a/user/user_main.c
+++ b/user/user_main.c
@@ -104,6 +104,7 @@ static ip_addr_t dns_ip;
 bool connected;
 uint8_t my_channel;
 bool do_ip_config;
+int new_portmap;
 
 static ip_addr_t resolve_ip;
 
@@ -1399,7 +1400,7 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn)
                 to_console(response);
             }
 #endif
-            for (i = 0; i < IP_PORTMAP_MAX; i++)
+            for (i = 0; i < config.max_portmap; i++)
             {
                 p = &ip_portmap_table[i];
                 if (p->valid)
@@ -2005,9 +2006,21 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn)
 
         if (nTokens == 1 || (nTokens == 2 && strcmp(tokens[1], "config") == 0))
         {
+            if (config.max_portmap >= new_portmap)
+            {
+                // if nothing has changed or table is smaller, save the current portmap table
+                blob_save(0, (uint32_t *)ip_portmap_table, sizeof(struct portmap_table) * new_portmap);
+            } else {
+                // if max_portmap has increased, save the new size
+                uint8_t mem[sizeof(struct portmap_table) * new_portmap];
+                os_memset(mem, 0, sizeof(mem));
+                os_memcpy(mem, (uint8_t *)ip_portmap_table, sizeof(struct portmap_table) * config.max_portmap);
+                blob_save(0, (uint32_t *)mem, sizeof(mem));
+            }
+            int save_portmap = config.max_portmap;
+            config.max_portmap = new_portmap;
             config_save(&config);
-            // also save the portmap table
-            blob_save(0, (uint32_t *)ip_portmap_table, sizeof(struct portmap_table) * IP_PORTMAP_MAX);
+            config.max_portmap = save_portmap;
             os_sprintf_flash(response, "Config saved\r\n");
             goto command_handled;
         }
@@ -2034,7 +2047,7 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn)
             config.dhcps_entries = i;
             config_save(&config);
             // also save the portmap table
-            blob_save(0, (uint32_t *)ip_portmap_table, sizeof(struct portmap_table) * IP_PORTMAP_MAX);
+            blob_save(0, (uint32_t *)ip_portmap_table, sizeof(struct portmap_table) * config.max_portmap);
             os_sprintf_flash(response, "Config and DHCP table saved\r\n");
             goto command_handled;
         }
@@ -2131,7 +2144,7 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn)
             config_load_default(&config);
             config_save(&config);
             // clear saved portmap table
-            blob_zero(0, sizeof(struct portmap_table) * IP_PORTMAP_MAX);
+            blob_zero(0, sizeof(struct portmap_table) * config.max_portmap);
         }
         os_printf("Restarting ... \r\n");
         system_restart();
@@ -2743,8 +2756,8 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn)
 
             if (strcmp(tokens[1], "max_portmap") == 0)
             {
-                config.max_portmap = atoi(tokens[2]);
-                os_sprintf(response, "Portmap table size set to %ds\r\n", config.max_portmap);
+                new_portmap = atoi(tokens[2]);
+                os_sprintf(response, "Portmap table size set to %ds\r\n", new_portmap);
                 goto command_handled;
             }
 
@@ -3567,7 +3580,7 @@ void ICACHE_FLASH_ATTR timer_func(void *arg)
                 config_load_default(&config);
                 config.hw_reset = pin;
                 config_save(&config);
-                blob_zero(0, sizeof(struct portmap_table) * IP_PORTMAP_MAX);
+                blob_zero(0, sizeof(struct portmap_table) * config.max_portmap);
                 system_restart();
                 while (true)
                     ;
@@ -3889,7 +3902,7 @@ void wifi_handle_event_cb(System_Event_t *evt)
         patch_netif(my_ip, my_input_sta, &orig_input_sta, my_output_sta, &orig_output_sta, false);
 
         // Update any predefined portmaps to the new IP addr
-        for (i = 0; i < IP_PORTMAP_MAX; i++)
+        for (i = 0; i < config.max_portmap; i++)
         {
             if (ip_portmap_table[i].valid)
             {
@@ -4239,16 +4252,17 @@ void ICACHE_FLASH_ATTR user_init()
 
     // Load config
     uint8_t config_state = config_load(&config);
+    new_portmap = config.max_portmap;
     ip_napt_init(config.max_nat, config.max_portmap);
     if (config_state == 0)
     {
         // valid config in FLASH, can read portmap table
-        blob_load(0, (uint32_t *)ip_portmap_table, sizeof(struct portmap_table) * IP_PORTMAP_MAX);
+        blob_load(0, (uint32_t *)ip_portmap_table, sizeof(struct portmap_table) * config.max_portmap);
     }
     else
     {
         // clear portmap table
-        blob_zero(0, sizeof(struct portmap_table) * IP_PORTMAP_MAX);
+        blob_zero(0, sizeof(struct portmap_table) * config.max_portmap);
     }
 
     if (config.tcp_timeout != 0)