diff --git a/ChangeLog b/ChangeLog
index 167fe6d..975ed26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 Version 1.6.18
 *******************************************************************************
 
+2012-04-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+	Disable SetGenaCallback call if device is disabled.
+
+	If device is disabled, SetGenaCallback definition is disabled,
+	but its call remains. A link error will occur in Win32.
+
 2012-04-21 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
 
 	Fix condition for allocation failure in get_content_type().
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 136d9e9..e5196bf 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -364,9 +364,11 @@ static int UpnpInitPreamble(void)
 #endif
 #endif /* INCLUDE_DEVICE_APIS */
 
+#ifdef INTERNAL_WEB_SERVER
 #if EXCLUDE_GENA == 0
 	SetGenaCallback(genaCallback);
 #endif
+#endif /* INTERNAL_WEB_SERVER */
 
 	/* Initialize the SDK timer thread. */
 	retVal = TimerThreadInit( &gTimerThread, &gSendThreadPool );