diff --git a/src/back/backlasses.cpp b/src/back/backlasses.cpp
index 2370f08..029ff61 100644
--- a/src/back/backlasses.cpp
+++ b/src/back/backlasses.cpp
@@ -289,10 +289,11 @@ Endpoint::Endpoint(IMMDevice* ep, uint64_t idx){
 void Endpoint::activateEndpointSessions() {	
     //sessionManager;
 	if (FAILED(endpoint->Activate(__uuidof(IAudioSessionManager2), CLSCTX_ALL, NULL, (void**) &sessionManager))) { log_wdebugcpp(L"sesionbros..."); return; }
-
+	
 	IAudioSessionEnumerator* sessionEnumerator = nullptr;
 	if (FAILED(sessionManager->GetSessionEnumerator(&sessionEnumerator))) { log_wdebugcpp(L"sesEnumeratorBros..."); return; }
 
+	endpointSessions.resize(1, nullptr);
 	int sessionCount;
 	sessionEnumerator->GetCount(&sessionCount);
 	for (int i = 0; i < sessionCount; i++) {
@@ -304,7 +305,8 @@ void Endpoint::activateEndpointSessions() {
 		sessionControl->AddRef();
 		sessionControlTmp->Release();
 		Session* session = new Session(this, sessionControl, (size_t)i);
-		endpointSessions.push_back(session);
+		if (sessionControl->IsSystemSoundsSession() == S_OK) endpointSessions[0] = session;
+                                          else endpointSessions.push_back(session);
 	}
 	sessionEnumerator->Release();
 }
diff --git a/src/qt/qtclasses.h b/src/qt/qtclasses.h
index 549569d..0132e45 100644
--- a/src/qt/qtclasses.h
+++ b/src/qt/qtclasses.h
@@ -233,8 +233,6 @@ private:
 	QAction *trayIconMenuOpenCP;
 	QTimer *ewsUpdateTimer;
 	static constexpr uint64_t ewsUpdateTimerFrequency = 500;
-	//TODO: Test
-	//TODO: Come back here and check all are parametrized
 	double widthRatio = 0.28;
 	
 	QScrollArea *scrollArea;