diff --git a/device-common.mk b/device-common.mk
index 0ceb1242..05d0d4ed 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -14,7 +14,9 @@
 # limitations under the License.
 #
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
 -include vendor/google_devices/gs201/proprietary/telephony/device-vendor.mk
+endif
 include device/google/gs201/device.mk
 include device/google/gs101/tts/voice_packs.mk
 
diff --git a/device.mk b/device.mk
index c94a8902..d3725496 100644
--- a/device.mk
+++ b/device.mk
@@ -60,9 +60,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
 # Include vendor telephony soong namespace
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
+endif
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 #Set IKE logs to verbose for WFC
@@ -848,6 +850,7 @@ PRODUCT_PACKAGES += \
 	calliope_iva.bin \
 	vts.bin
 
+ifneq ($(BOARD_WITHOUT_RADIO),true)
 # This will be called only if IMSService is building with source code for dev branches.
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk)
 
@@ -858,6 +861,7 @@ PRODUCT_PACKAGES_DEBUG += \
 	TestRcsApp
 
 PRODUCT_PACKAGES += ShannonRcs
+endif
 
 # Boot Control HAL
 PRODUCT_PACKAGES += \