diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp
index e043ee0e..579f76b4 100644
--- a/src/WSRequestHandler_Sources.cpp
+++ b/src/WSRequestHandler_Sources.cpp
@@ -8,6 +8,16 @@
 
 #include "WSRequestHandler.h"
 
+bool isTextGDIPlusSource(const QString& sourceKind)
+{
+	return (sourceKind == "text_gdiplus" || sourceKind == "text_gdiplus_v2");
+}
+
+bool isTextFreeType2Source(const QString& sourceKind)
+{
+	return (sourceKind == "text_ft2" || sourceKind == "text_ft2_v2");
+}
+
 /**
 * List all sources available in the running OBS instance
 *
@@ -536,8 +546,8 @@ RpcResponse WSRequestHandler::GetTextGDIPlusProperties(const RpcRequest& request
 		return request.failed("specified source doesn't exist");
 	}
 
-	QString sourceId = obs_source_get_id(source);
-	if (sourceId != "text_gdiplus") {
+	QString sourceKind = obs_source_get_id(source);
+	if (!isTextGDIPlusSource(sourceKind)) {
 		return request.failed("not a text gdi plus source");
 	}
 
@@ -601,8 +611,8 @@ RpcResponse WSRequestHandler::SetTextGDIPlusProperties(const RpcRequest& request
 		return request.failed("specified source doesn't exist");
 	}
 
-	QString sourceId = obs_source_get_id(source);
-	if (sourceId != "text_gdiplus") {
+	QString sourceKind = obs_source_get_id(source);
+	if (!isTextGDIPlusSource(sourceKind)) {
 		return request.failed("not a text gdi plus source");
 	}
 
@@ -767,8 +777,8 @@ RpcResponse WSRequestHandler::GetTextFreetype2Properties(const RpcRequest& reque
 		return request.failed("specified source doesn't exist");
 	}
 
-	QString sourceId = obs_source_get_id(source);
-	if (sourceId != "text_ft2_source") {
+	QString sourceKind = obs_source_get_id(source);
+	if (!isTextFreeType2Source(sourceKind)) {
 		return request.failed("not a freetype 2 source");
 	}
 
@@ -815,8 +825,8 @@ RpcResponse WSRequestHandler::SetTextFreetype2Properties(const RpcRequest& reque
 		return request.failed("specified source doesn't exist");
 	}
 
-	QString sourceId = obs_source_get_id(source);
-	if (sourceId != "text_ft2_source") {
+	QString sourceKind = obs_source_get_id(source);
+	if (!isTextFreeType2Source(sourceKind)) {
 		return request.failed("not text freetype 2 source");
 	}