diff --git a/hif/inc/hif.h b/hif/inc/hif.h
index 92916fabcc..e525da7998 100644
--- a/hif/inc/hif.h
+++ b/hif/inc/hif.h
@@ -97,9 +97,9 @@ typedef void *hif_handle_t;
 /* For Tufello1.0 target_reg_tbl ID*/
 #define TARGET_TYPE_QCA9377V1   17
 #endif /* ENABLE_10_4_FW_HDR */
-/* For Adrastea target */
-#define TARGET_TYPE_ADRASTEA     19
 #endif /* CONFIG_WIN */
+/* For Adrastea target */
+#define TARGET_TYPE_ADRASTEA  19
 #ifndef TARGET_TYPE_QCA8074
 #define TARGET_TYPE_QCA8074   20
 #endif
diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c
index 10928d75d4..715044d3c2 100644
--- a/hif/src/hif_main.c
+++ b/hif/src/hif_main.c
@@ -799,6 +799,11 @@ int hif_get_device_type(uint32_t device_id,
 		ret = -ENODEV;
 		break;
 	}
+
+	if (*target_type == TARGET_TYPE_UNKNOWN) {
+		HIF_ERROR("%s: Unsupported target_type!", __func__);
+		ret = -ENODEV;
+	}
 end:
 	return ret;
 }