diff --git a/Makefile b/Makefile
index 9ab1992..6fb616b 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,6 @@ DEBUGINFO	?= $(prefix)/lib/debug/
 DEBUGSOURCE	?= $(prefix)/src/debug/
 OSLABEL		?= $(EFIDIR)
 DEFAULT_LOADER	?= \\\\grub$(ARCH_SUFFIX).efi
-REQUIRE_TPM	?=
 
 ARCH		?= $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
 OBJCOPY_GTE224	= $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^.*\((.*)\|version\) //g' | cut -f1-2 -d.` \>= 2.24)
diff --git a/shim.c b/shim.c
index 34b819a..6d777d8 100644
--- a/shim.c
+++ b/shim.c
@@ -1829,8 +1829,10 @@ EFI_STATUS shim_verify (void *buffer, UINT32 size)
 		goto done;
 #endif
 
-	if (!secure_mode())
+	if (!secure_mode()) {
+		status = EFI_SUCCESS;
 		goto done;
+	}
 
 	status = verify_buffer(buffer, size, &context, sha256hash, sha1hash);