diff --git a/quantum/qmk_settings.h b/quantum/qmk_settings.h
index 52b4d76ac6..1dfcca50a4 100644
--- a/quantum/qmk_settings.h
+++ b/quantum/qmk_settings.h
@@ -77,6 +77,17 @@
 #define AUTO_SHIFT_NO_AUTO_REPEAT_Defined 0
 #endif
 
+/* ========================================================================== */
+/* One shot keys                                                              */
+/* ========================================================================== */
+#ifndef ONESHOT_TAP_TOGGLE
+#define ONESHOT_TAP_TOGGLE 5
+#endif
+
+#ifndef ONESHOT_TIMEOUT
+#define ONESHOT_TIMEOUT 5000
+#endif
+
 #ifdef QMK_SETTINGS
 /* dynamic settings framework is enabled */
 
diff --git a/quantum/vial.c b/quantum/vial.c
index 601008bd4f..6b67f7762f 100644
--- a/quantum/vial.c
+++ b/quantum/vial.c
@@ -182,10 +182,15 @@ void vial_handle_cmd(uint8_t *msg, uint8_t length) {
             break;
         }
         case vial_qmk_settings_query: {
+#ifdef QMK_SETTINGS
             uint16_t qsid_greater_than = msg[2] | (msg[3] << 8);
             qmk_settings_query(qsid_greater_than, msg, length);
+#else
+            memset(msg, 0xFF, length); /* indicate that we don't support any qsid */
+#endif
             break;
         }
+#ifdef QMK_SETTINGS
         case vial_qmk_settings_get: {
             uint16_t qsid = msg[2] | (msg[3] << 8);
             msg[0] = qmk_settings_get(qsid, &msg[1], length - 1);
@@ -202,6 +207,7 @@ void vial_handle_cmd(uint8_t *msg, uint8_t length) {
             qmk_settings_reset();
             break;
         }
+#endif
         case vial_dynamic_entry_op: {
             switch (msg[2]) {
             case dynamic_vial_get_number_of_entries: {