diff --git a/src/main/config/config.c b/src/main/config/config.c
index 7f2b45743e..4c6e124f54 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -152,7 +152,7 @@ static void resetPidProfile(pidProfile_t *pidProfile)
     pidProfile->P8[PITCH] = 40;
     pidProfile->I8[PITCH] = 30;
     pidProfile->D8[PITCH] = 18;
-    pidProfile->P8[YAW] = 95;
+    pidProfile->P8[YAW] = 100;
     pidProfile->I8[YAW] = 50;
     pidProfile->D8[YAW] = 10;
     pidProfile->P8[PIDALT] = 50;
@@ -167,8 +167,8 @@ static void resetPidProfile(pidProfile_t *pidProfile)
     pidProfile->P8[PIDNAVR] = 25; // NAV_P * 10;
     pidProfile->I8[PIDNAVR] = 33; // NAV_I * 100;
     pidProfile->D8[PIDNAVR] = 83; // NAV_D * 1000;
-    pidProfile->P8[PIDLEVEL] = 20;
-    pidProfile->I8[PIDLEVEL] = 20;
+    pidProfile->P8[PIDLEVEL] = 50;
+    pidProfile->I8[PIDLEVEL] = 50;
     pidProfile->D8[PIDLEVEL] = 100;
     pidProfile->P8[PIDMAG] = 40;
     pidProfile->P8[PIDVEL] = 120;
diff --git a/src/main/rx/sbus.c b/src/main/rx/sbus.c
index 8f5da398d2..75e9fdd7cd 100644
--- a/src/main/rx/sbus.c
+++ b/src/main/rx/sbus.c
@@ -161,14 +161,14 @@ static void sbusDataReceive(uint16_t c)
 
     if (sbusFramePosition < SBUS_FRAME_SIZE) {
         sbusFrame.bytes[sbusFramePosition++] = (uint8_t)c;
-    }
-    if (sbusFramePosition < SBUS_FRAME_SIZE) {
-        sbusFrameDone = false;
-    } else {
-        sbusFrameDone = true;
+        if (sbusFramePosition < SBUS_FRAME_SIZE) {
+            sbusFrameDone = false;
+        } else {
+            sbusFrameDone = true;
 #ifdef DEBUG_SBUS_PACKETS
         debug[2] = sbusFrameTime;
 #endif
+        }
     }
 }