diff --git a/Sentry.xcodeproj/project.pbxproj b/Sentry.xcodeproj/project.pbxproj
index 89ad8d24dc0..e9ce34fbcd3 100644
--- a/Sentry.xcodeproj/project.pbxproj
+++ b/Sentry.xcodeproj/project.pbxproj
@@ -1848,7 +1848,6 @@
 		D855B3E727D652AF00BCED76 /* SentryCoreDataTrackingIntegrationTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryCoreDataTrackingIntegrationTest.swift; sourceTree = "<group>"; };
 		D855B3E927D652C700BCED76 /* TestCoreDataStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestCoreDataStack.swift; sourceTree = "<group>"; };
 		D856272B2A374A8600FB8062 /* UrlSanitized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UrlSanitized.swift; sourceTree = "<group>"; };
-		D85723EF2BBC3BDC004AC5E1 /* SentryNoUI.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SentryNoUI.xcconfig; sourceTree = "<group>"; };
 		D85790282976A69F00C6AC1F /* TestDebugImageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestDebugImageProvider.swift; sourceTree = "<group>"; };
 		D85852B427ECEEDA00C6D8AE /* SentryScreenshot.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryScreenshot.m; sourceTree = "<group>"; };
 		D85852B827EDDC5900C6D8AE /* SentryUIApplication.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryUIApplication.m; sourceTree = "<group>"; };
@@ -2490,7 +2489,6 @@
 				84B7FA4729B2995A00AD93B1 /* DeploymentTargets.xcconfig */,
 				63AA75C51EB8B00100D153DE /* Sentry.xcconfig */,
 				D8199DCF29376FF40074249E /* SentrySwiftUI.xcconfig */,
-				D85723EF2BBC3BDC004AC5E1 /* SentryNoUI.xcconfig */,
 			);
 			path = Configuration;
 			sourceTree = "<group>";
@@ -5372,7 +5370,6 @@
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DCARTHAGE_$(CARTHAGE)";
-				OTHER_SWIFT_FLAGS = "-DTEST";
 				PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
 				PRODUCT_NAME = Sentry;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5480,7 +5477,7 @@
 		};
 		841C60C42A69DE6B00E1C00F /* Debug_without_UIKit */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D85723EF2BBC3BDC004AC5E1 /* SentryNoUI.xcconfig */;
+			baseConfigurationReference = 63AA75C51EB8B00100D153DE /* Sentry.xcconfig */;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
@@ -5972,7 +5969,7 @@
 		};
 		8483D06B2AC7627800143615 /* Release_without_UIKit */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D85723EF2BBC3BDC004AC5E1 /* SentryNoUI.xcconfig */;
+			baseConfigurationReference = 63AA75C51EB8B00100D153DE /* Sentry.xcconfig */;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
@@ -6242,7 +6239,6 @@
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DCARTHAGE_$(CARTHAGE)";
-				OTHER_SWIFT_FLAGS = "-DTEST";
 				PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
 				PRODUCT_NAME = Sentry;
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Sources/Configuration/SDK.xcconfig b/Sources/Configuration/SDK.xcconfig
index fccf5ae1380..c94888780f0 100644
--- a/Sources/Configuration/SDK.xcconfig
+++ b/Sources/Configuration/SDK.xcconfig
@@ -34,9 +34,9 @@ CLANG_CXX_LIBRARY = libc++
 HEADER_SEARCH_PATHS = $(SRCROOT)/Sources/Sentry/include/**
 
 SWIFT_ACTIVE_COMPILATION_CONDITIONS_Debug = DEBUG
-SWIFT_ACTIVE_COMPILATION_CONDITIONS_Debug_without_UIKit = DEBUG
+SWIFT_ACTIVE_COMPILATION_CONDITIONS_Debug_without_UIKit = DEBUG SENTRY_NO_UIKIT
 SWIFT_ACTIVE_COMPILATION_CONDITIONS_Test = TEST
 SWIFT_ACTIVE_COMPILATION_CONDITIONS_TestCI = TESTCI
 SWIFT_ACTIVE_COMPILATION_CONDITIONS_Release =
-SWIFT_ACTIVE_COMPILATION_CONDITIONS_Release_without_UIKit =
+SWIFT_ACTIVE_COMPILATION_CONDITIONS_Release_without_UIKit = SENTRY_NO_UIKIT
 SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(SWIFT_ACTIVE_COMPILATION_CONDITIONS_$(CONFIGURATION))
diff --git a/Sources/Configuration/SentryNoUI.xcconfig b/Sources/Configuration/SentryNoUI.xcconfig
deleted file mode 100644
index ed2b439eaa4..00000000000
--- a/Sources/Configuration/SentryNoUI.xcconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "Sentry.xcconfig"
-
-//This is how we avoid linking UIKit from Swift code
-//when compiling without UIKit
-OTHER_SWIFT_FLAGS = -DSENTRY_NO_UIKIT