diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java
index 5c4406df2a..5b48316547 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/OS.java
@@ -342,7 +342,7 @@ static final native int GetGlyphPlacements(long ptr,
 
     //IWICImagingFactory
     static final native long CreateBitmap(long ptr, int uiWidth, int uiHeight, int pixelFormat, int options);
-    static final native long UninitializeCOM(long ptr);
+    static final native void UninitializeCOM(long ptr);
 
     //IWICBitmap
     static final native long Lock(long ptr, int x, int y, int width, int height, int flags);
diff --git a/modules/javafx.graphics/src/main/native-font/directwrite.cpp b/modules/javafx.graphics/src/main/native-font/directwrite.cpp
index 03849d5179..225d354619 100644
--- a/modules/javafx.graphics/src/main/native-font/directwrite.cpp
+++ b/modules/javafx.graphics/src/main/native-font/directwrite.cpp
@@ -2357,7 +2357,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(CreateBitmap)
     return SUCCEEDED(hr) ? (jlong)result : NULL;
 }
 
-JNIEXPORT jlong JNICALL OS_NATIVE(UninitializeCOM)
+JNIEXPORT void JNICALL OS_NATIVE(UninitializeCOM)
     (JNIEnv *env, jclass that, jlong arg0)
 {
     CoUninitialize();