diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt
index 375faffae..902850179 100644
--- a/UI/CMakeLists.txt
+++ b/UI/CMakeLists.txt
@@ -73,7 +73,7 @@ find_package(Threads REQUIRED)
 find_package(Qt5Network ${FIND_MODE})
 find_package(Qt5Widgets ${FIND_MODE})
 find_package(Qt5Svg ${FIND_MODE})
-if(WIN32)
+if(WIN32 AND (Qt5Widgets_VERSION VERSION_LESS 6.0.0))
 	find_package(Qt5WinExtras ${FIND_MODE})
 endif()
 find_package(Qt5Xml ${FIND_MODE})
@@ -452,8 +452,11 @@ if(WIN32)
 	set_target_properties(obs
 		PROPERTIES
 			OUTPUT_NAME "obs${_output_suffix}")
-	target_link_libraries(obs
-			Qt5::WinExtras)
+
+	if(Qt5Widgets_VERSION VERSION_LESS 6.0.0)
+		target_link_libraries(obs
+				Qt5::WinExtras)		
+	endif()	
 endif()
 
 target_link_libraries(obs
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 17abfcee2..8c18e14b5 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -1976,7 +1976,7 @@ void OBSBasic::OBSInit()
 	SystemTray(true);
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	taskBtn->setWindow(windowHandle());
 #endif
 
@@ -6542,7 +6542,7 @@ inline void OBSBasic::OnActivate(bool force)
 		App()->IncrementSleepInhibition();
 		UpdateProcessPriority();
 
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 		taskBtn->setOverlayIcon(QIcon::fromTheme(
 			"obs-active", QIcon(":/res/images/active.png")));
 #endif
@@ -6573,7 +6573,7 @@ inline void OBSBasic::OnDeactivate()
 		App()->DecrementSleepInhibition();
 		ClearProcessPriority();
 
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 		taskBtn->clearOverlayIcon();
 #endif
 		if (trayIcon && trayIcon->isVisible()) {
@@ -6600,7 +6600,7 @@ inline void OBSBasic::OnDeactivate()
 #endif
 			trayIcon->setIcon(QIcon::fromTheme("obs-tray-paused",
 							   trayIconFile));
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 			taskBtn->setOverlayIcon(QIcon::fromTheme(
 				"obs-paused",
 				QIcon(":/res/images/paused.png")));
@@ -6616,7 +6616,7 @@ inline void OBSBasic::OnDeactivate()
 #endif
 			trayIcon->setIcon(QIcon::fromTheme("obs-tray-active",
 							   trayIconFile));
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 			taskBtn->setOverlayIcon(QIcon::fromTheme(
 				"obs-active",
 				QIcon(":/res/images/active.png")));
@@ -9537,7 +9537,7 @@ void OBSBasic::PauseRecording()
 
 		ui->statusbar->RecordingPaused();
 
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 		taskBtn->setOverlayIcon(QIcon::fromTheme(
 			"obs-paused", QIcon(":/res/images/paused.png")));
 #endif
@@ -9581,7 +9581,7 @@ void OBSBasic::UnpauseRecording()
 
 		ui->statusbar->RecordingUnpaused();
 
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 		taskBtn->setOverlayIcon(QIcon::fromTheme(
 			"obs-active", QIcon(":/res/images/active.png")));
 #endif
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index fd27144e1..bae066f84 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -22,7 +22,7 @@
 #include <QThread>
 #include <QWidgetAction>
 #include <QSystemTrayIcon>
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QWinTaskbarButton>
 #endif
 #include <QStyledItemDelegate>
@@ -317,7 +317,7 @@ private:
 	QPointer<QAction> renameScene;
 	QPointer<QAction> renameSource;
 
-#ifdef _WIN32
+#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	QWinTaskbarButton *taskBtn = new QWinTaskbarButton(this);
 #endif