diff --git a/projects/clr/hipamd/samples/2_Cookbook/4_shfl/Makefile b/projects/clr/hipamd/samples/2_Cookbook/4_shfl/Makefile
index 21c0e93959..56f54d9518 100644
--- a/projects/clr/hipamd/samples/2_Cookbook/4_shfl/Makefile
+++ b/projects/clr/hipamd/samples/2_Cookbook/4_shfl/Makefile
@@ -3,6 +3,10 @@ ifeq (,$(HIP_PATH))
 	HIP_PATH=../../..
 endif
 
+ifeq (gfx701, $(findstring gfx701,$(HCC_AMDGPU_TARGET)))
+	$(error gfx701 is not a supported device for this sample)
+endif
+
 HIPCC=$(HIP_PATH)/bin/hipcc
 
 TARGET=hcc
@@ -22,7 +26,7 @@ CXX=$(HIPCC)
 
 
 $(EXECUTABLE): $(OBJECTS)
-	$(HIPCC) --amdgpu-target=gfx803 $(OBJECTS) -o $@
+	$(HIPCC) $(OBJECTS) -o $@
 
 
 test: $(EXECUTABLE)
diff --git a/projects/clr/hipamd/samples/2_Cookbook/5_2dshfl/Makefile b/projects/clr/hipamd/samples/2_Cookbook/5_2dshfl/Makefile
index 6abaf658b1..cfadb1a311 100644
--- a/projects/clr/hipamd/samples/2_Cookbook/5_2dshfl/Makefile
+++ b/projects/clr/hipamd/samples/2_Cookbook/5_2dshfl/Makefile
@@ -3,6 +3,10 @@ ifeq (,$(HIP_PATH))
 	HIP_PATH=../../..
 endif
 
+ifeq (gfx701, $(findstring gfx701,$(HCC_AMDGPU_TARGET)))
+	$(error gfx701 is not a supported device for this sample)
+endif
+
 HIPCC=$(HIP_PATH)/bin/hipcc
 
 TARGET=hcc
@@ -22,7 +26,7 @@ CXX=$(HIPCC)
 
 
 $(EXECUTABLE): $(OBJECTS)
-	$(HIPCC) --amdgpu-target=gfx803 $(OBJECTS) -o $@
+	$(HIPCC) $(OBJECTS) -o $@
 
 
 test: $(EXECUTABLE)