diff --git a/hmi/dev/nspanel_eu_code/home.txt b/hmi/dev/nspanel_eu_code/home.txt
index 542e178..4991116 100644
--- a/hmi/dev/nspanel_eu_code/home.txt
+++ b/hmi/dev/nspanel_eu_code/home.txt
@@ -733,6 +733,10 @@ TouchCap swipe
             wakeup_timer.en=1 // Set brightness to saved value (from HA)
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -754,9 +758,6 @@ TouchCap swipe
                     }else if(is_buttonpage01==1)
                     {
                         page buttonpage01
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
                 // Right to Left swipe now navigates to home, looping back to the start.
@@ -776,9 +777,6 @@ TouchCap swipe
                     }else if(is_buttonpage04==1)
                     {
                         page buttonpage04
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
             }
@@ -807,13 +805,10 @@ TouchCap swipe
                     }else if(is_buttonpage02==1&&is_buttonpage01==1)
                     {
                         page buttonpage01
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     // Navigate back up the sequence based on active status
@@ -835,9 +830,6 @@ TouchCap swipe
                     }else if(is_buttonpage03==1&&is_buttonpage04==1)
                     {
                         page buttonpage04
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
             }
diff --git a/hmi/dev/nspanel_us_land_code/home.txt b/hmi/dev/nspanel_us_land_code/home.txt
index 542e178..4991116 100644
--- a/hmi/dev/nspanel_us_land_code/home.txt
+++ b/hmi/dev/nspanel_us_land_code/home.txt
@@ -733,6 +733,10 @@ TouchCap swipe
             wakeup_timer.en=1 // Set brightness to saved value (from HA)
         
         Touch Release Event
+            if(api==0)
+            {
+                page home
+            }
             swipestore.en=0
             // Touch has ended, x
             if(tch0==0)
@@ -754,9 +758,6 @@ TouchCap swipe
                     }else if(is_buttonpage01==1)
                     {
                         page buttonpage01
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
                 // Right to Left swipe now navigates to home, looping back to the start.
@@ -776,9 +777,6 @@ TouchCap swipe
                     }else if(is_buttonpage04==1)
                     {
                         page buttonpage04
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
             }
@@ -807,13 +805,10 @@ TouchCap swipe
                     }else if(is_buttonpage02==1&&is_buttonpage01==1)
                     {
                         page buttonpage01
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
                 // Down to Up
-                swipec=0-swipedy
+                swipec2=0-swipedy
                 if(swipec<-100)
                 {
                     // Navigate back up the sequence based on active status
@@ -835,9 +830,6 @@ TouchCap swipe
                     }else if(is_buttonpage03==1&&is_buttonpage04==1)
                     {
                         page buttonpage04
-                    }else
-                    {
-                        // Do nothing
                     }
                 }
             }
diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI
index 7337392..461c350 100644
Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ
diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft
index 550a5b6..a5cbffd 100644
Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ
diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI
index c0f4b4c..62e4b5f 100644
Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ
diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft
index 4e8dfb6..0e2948c 100644
Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ