diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/default/config.h b/qmk_firmware/keyboards/keyball/keyball39/keymaps/default/config.h
index 35c90651b..ec062cf45 100644
--- a/qmk_firmware/keyboards/keyball/keyball39/keymaps/default/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball39/keymaps/default/config.h
@@ -36,3 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball39/keymaps/via/config.h b/qmk_firmware/keyboards/keyball/keyball39/keymaps/via/config.h
index c5a6eb498..9736eae89 100644
--- a/qmk_firmware/keyboards/keyball/keyball39/keymaps/via/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball39/keymaps/via/config.h
@@ -36,3 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball44/keymaps/default/config.h b/qmk_firmware/keyboards/keyball/keyball44/keymaps/default/config.h
index 35c90651b..ec062cf45 100644
--- a/qmk_firmware/keyboards/keyball/keyball44/keymaps/default/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball44/keymaps/default/config.h
@@ -36,3 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball44/keymaps/via/config.h b/qmk_firmware/keyboards/keyball/keyball44/keymaps/via/config.h
index c5a6eb498..9736eae89 100644
--- a/qmk_firmware/keyboards/keyball/keyball44/keymaps/via/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball44/keymaps/via/config.h
@@ -36,3 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/default/config.h b/qmk_firmware/keyboards/keyball/keyball46/keymaps/default/config.h
index e3e77177e..e44b0be85 100644
--- a/qmk_firmware/keyboards/keyball/keyball46/keymaps/default/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball46/keymaps/default/config.h
@@ -39,3 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via/config.h b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via/config.h
index aad14599c..8ed16be59 100644
--- a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via/config.h
@@ -36,3 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Both/config.h b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Both/config.h
index 667712b58..eedf25f42 100644
--- a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Both/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Both/config.h
@@ -39,3 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Left/config.h b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Left/config.h
index b9268e6c2..30a67de66 100644
--- a/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Left/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball46/keymaps/via_Left/config.h
@@ -39,3 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball61/keymaps/default/config.h b/qmk_firmware/keyboards/keyball/keyball61/keymaps/default/config.h
index 35c90651b..ec062cf45 100644
--- a/qmk_firmware/keyboards/keyball/keyball61/keymaps/default/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball61/keymaps/default/config.h
@@ -36,3 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/keyball61/keymaps/via/config.h b/qmk_firmware/keyboards/keyball/keyball61/keymaps/via/config.h
index c5a6eb498..9736eae89 100644
--- a/qmk_firmware/keyboards/keyball/keyball61/keymaps/via/config.h
+++ b/qmk_firmware/keyboards/keyball/keyball61/keymaps/via/config.h
@@ -36,3 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAP_CODE_DELAY 5
 
 #define POINTING_DEVICE_AUTO_MOUSE_ENABLE
+#define AUTO_MOUSE_DEFAULT_LAYER 1
diff --git a/qmk_firmware/keyboards/keyball/lib/keyball/keyball.c b/qmk_firmware/keyboards/keyball/lib/keyball/keyball.c
index ad2c66258..312056c51 100644
--- a/qmk_firmware/keyboards/keyball/lib/keyball/keyball.c
+++ b/qmk_firmware/keyboards/keyball/lib/keyball/keyball.c
@@ -165,10 +165,6 @@ void pointing_device_driver_init(void) {
 #    endif
 #endif
         pmw3360_cpi_set(CPI_DEFAULT - 1);
-
-#ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
-        set_auto_mouse_layer(1);
-#endif
     }
 }