diff --git a/src/classic/avdtp.c b/src/classic/avdtp.c
index 5d277d664..5c0e464d1 100644
--- a/src/classic/avdtp.c
+++ b/src/classic/avdtp.c
@@ -325,12 +325,12 @@ static void avdtp_handle_start_sdp_client_query(void * context){
                         break;
                     default:
                         btstack_unreachable();
-                        break;
+                        return;
                 }
                 break;
             default:
                 btstack_unreachable();
-                break;
+                return;
         }
 
         // Start & track query