diff --git a/src/jpegls-wic-codec.rc b/src/jpegls-wic-codec.rc
index c588411..de7a558 100644
--- a/src/jpegls-wic-codec.rc
+++ b/src/jpegls-wic-codec.rc
@@ -34,6 +34,7 @@ BEGIN
             VALUE "OriginalFilename", L"jpegls-wic-codec.dll"
             VALUE "ProductName", L"JPEG-LS WIC codec"
             VALUE "ProductVersion", VERSION
+            VALUE "OLESelfRegister", "\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/jpegls_bitmap_encoder.cpp b/src/jpegls_bitmap_encoder.cpp
index 41b0d82..aff4dba 100644
--- a/src/jpegls_bitmap_encoder.cpp
+++ b/src/jpegls_bitmap_encoder.cpp
@@ -191,8 +191,7 @@ struct jpegls_bitmap_encoder : implements<jpegls_bitmap_encoder, IWICBitmapEncod
 
         // Note: the current implementation doesn't write metadata to the JPEG-LS stream.
         //       The SPIFF header can be used to store metadata items.
-        constexpr HRESULT result = wincodec::error_unsupported_operation;
-        return result;
+        return wincodec::error_unsupported_operation;
     }
 
     HRESULT __stdcall SetPalette(_In_ IWICPalette* palette) noexcept override
diff --git a/test/dllmain_test.cpp b/test/dllmain_test.cpp
index 18207fc..d286606 100644
--- a/test/dllmain_test.cpp
+++ b/test/dllmain_test.cpp
@@ -10,6 +10,7 @@ import guids;
 import util;
 import winrt;
 import "win.h";
+import "std.h";
 
 using namespace winrt;
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
@@ -90,6 +91,23 @@ TEST_CLASS(dllmain_test)
         Assert::AreEqual(error_no_aggregation, result);
     }
 
+    TEST_METHOD(marked_for_self_registration) // NOLINT
+    {
+        const wchar_t dll_name[]{L"jpegls-wic-codec.dll"};
+        DWORD not_used;
+        const DWORD size{GetFileVersionInfoSizeEx(FILE_VER_GET_NEUTRAL, dll_name, &not_used)};
+        Assert::IsTrue(size != 0);
+
+        std::vector<std::byte> buffer(size);
+        bool result = GetFileVersionInfoEx(FILE_VER_GET_NEUTRAL, dll_name, 0, size, buffer.data());
+        Assert::IsTrue(result);
+
+        void* value;
+        UINT value_size;
+        result = VerQueryValue(buffer.data(), L"\\StringFileInfo\\000004b0\\OLESelfRegister", &value, &value_size);
+        Assert::IsTrue(result);
+    }
+
 private:
     factory factory_;
 };