diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp
index b45c024cd..d60343f2c 100644
--- a/plugins/channeltx/modnfm/nfmmodplugin.cpp
+++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp
@@ -49,6 +49,15 @@ void NFMModPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerTxChannel(NFMMod::m_channelIdURI, NFMMod::m_channelId, this);
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(
+        const QString& channelName __attribute__((unused)),
+        DeviceUISet *deviceUISet __attribute__((unused)),
+        BasebandSampleSource *txChannel __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(const QString& channelName, DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
 	if(channelName == NFMMod::m_channelIdURI)
@@ -59,6 +68,7 @@ PluginInstanceGUI* NFMModPlugin::createTxChannelGUI(const QString& channelName,
 		return 0;
 	}
 }
+#endif
 
 BasebandSampleSource* NFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI)
 {
diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
index 1f542f4b1..f882189cc 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
@@ -31,7 +31,7 @@
 
 const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = {
     QString("LimeSDR Output"),
-    QString("3.8.6"),
+    QString("3.9.0"),
     QString("(c) Edouard Griffiths, F4EXB"),
     QString("https://github.com/f4exb/sdrangel"),
     true,
@@ -108,6 +108,15 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks()
     return result;
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
+        const QString& sinkId __attribute((unused)),
+        QWidget **widget __attribute((unused)),
+        DeviceUISet *deviceUISet __attribute((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
         const QString& sinkId,
         QWidget **widget,
@@ -124,6 +133,7 @@ PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
         return 0;
     }
 }
+#endif
 
 bool LimeSDROutputPlugin::findSerial(const char *lmsInfoStr, std::string& serial)
 {
@@ -154,6 +164,5 @@ DeviceSampleSink* LimeSDROutputPlugin::createSampleSinkPluginInstanceOutput(cons
     {
         return 0;
     }
-
 }
 
diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
index b6c097c6e..14af8b612 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
@@ -31,7 +31,7 @@
 
 const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = {
     QString("LimeSDR Input"),
-    QString("3.8.6"),
+    QString("3.9.0"),
     QString("(c) Edouard Griffiths, F4EXB"),
     QString("https://github.com/f4exb/sdrangel"),
     true,
@@ -108,6 +108,15 @@ PluginInterface::SamplingDevices LimeSDRInputPlugin::enumSampleSources()
     return result;
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
+        const QString& sourceId __attribute((unused)),
+        QWidget **widget __attribute((unused)),
+        DeviceUISet *deviceUISet __attribute((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
@@ -124,6 +133,7 @@ PluginInstanceGUI* LimeSDRInputPlugin::createSampleSourcePluginInstanceGUI(
         return 0;
     }
 }
+#endif
 
 bool LimeSDRInputPlugin::findSerial(const char *lmsInfoStr, std::string& serial)
 {
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
index d622a9753..bc4d9fecb 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
@@ -11,7 +11,7 @@
 
 const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
 	QString("RTL-SDR Input"),
-	QString("3.8.6"),
+	QString("3.9.0"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,
@@ -66,6 +66,15 @@ PluginInterface::SamplingDevices RTLSDRPlugin::enumSampleSources()
 	return result;
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
+        const QString& sourceId __attribute((unused)),
+        QWidget **widget __attribute((unused)),
+        DeviceUISet *deviceUISet __attribute((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
         const QString& sourceId,
         QWidget **widget,
@@ -79,6 +88,7 @@ PluginInstanceGUI* RTLSDRPlugin::createSampleSourcePluginInstanceGUI(
 		return 0;
 	}
 }
+#endif
 
 DeviceSampleSource *RTLSDRPlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI)
 {
diff --git a/pluginssrv/CMakeLists.txt b/pluginssrv/CMakeLists.txt
index 6387b75e7..1eaeea2b8 100644
--- a/pluginssrv/CMakeLists.txt
+++ b/pluginssrv/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(pluginssrv)
 
+add_definitions(-DSERVER_MODE)
+
 add_subdirectory(channelrx)
 add_subdirectory(channeltx)
 add_subdirectory(samplesink)