diff --git a/src/mumble/PluginManager.cpp b/src/mumble/PluginManager.cpp
index 5aff76270b..d285e5ec0e 100644
--- a/src/mumble/PluginManager.cpp
+++ b/src/mumble/PluginManager.cpp
@@ -176,7 +176,7 @@ bool PluginManager::eventFilter(QObject *target, QEvent *event) {
 	return QObject::eventFilter(target, event);
 }
 
-void PluginManager::unloadPlugins() const {
+void PluginManager::unloadPlugins() {
 	QReadLocker lock(&m_pluginCollectionLock);
 
 	auto it = m_pluginHashMap.begin();
@@ -538,7 +538,7 @@ bool PluginManager::loadPlugin(plugin_id_t pluginID) const {
 	return false;
 }
 
-void PluginManager::unloadPlugin(plugin_id_t pluginID) const {
+void PluginManager::unloadPlugin(plugin_id_t pluginID) {
 	plugin_ptr_t plugin;
 	{
 		QReadLocker lock(&m_pluginCollectionLock);
@@ -551,9 +551,20 @@ void PluginManager::unloadPlugin(plugin_id_t pluginID) const {
 	}
 }
 
-void PluginManager::unloadPlugin(Plugin &plugin) const {
+void PluginManager::unloadPlugin(Plugin &plugin) {
 	if (plugin.isLoaded()) {
 		// Only shut down loaded plugins
+
+		bool isActivePosDataPlugin = false;
+		{
+			QWriteLocker lock(&m_activePosDataPluginLock);
+			isActivePosDataPlugin = &plugin == m_activePositionalDataPlugin.get();
+		}
+
+		if (isActivePosDataPlugin) {
+			unlinkPositionalData();
+		}
+
 		plugin.shutdown();
 	}
 }
@@ -996,7 +1007,9 @@ void PluginManager::reportLostLink(mumble_plugin_id_t pluginID) {
 
 	const_plugin_ptr_t plugin = getPlugin(pluginID);
 
-	if (plugin) {
+	// Need to check for the presence of Global::get().l in case we are currently
+	// shutting down Mumble in which case the Log might already have been deleted.
+	if (plugin && Global::get().l) {
 		Global::get().l->log(Log::Information,
 							 PluginManager::tr("%1 lost link").arg(plugin->getName().toHtmlEscaped()));
 	}
diff --git a/src/mumble/PluginManager.h b/src/mumble/PluginManager.h
index 1cee2e7e9a..a79fc0075c 100644
--- a/src/mumble/PluginManager.h
+++ b/src/mumble/PluginManager.h
@@ -85,7 +85,7 @@ class PluginManager : public QObject {
 	bool eventFilter(QObject *target, QEvent *event) Q_DECL_OVERRIDE;
 
 	/// Unloads all plugins that are currently loaded.
-	void unloadPlugins() const;
+	void unloadPlugins();
 	/// Clears the current list of plugins
 	void clearPlugins();
 	/// Iterates over the plugins and tries to select a plugin that currently claims to be able to deliver positional
@@ -145,11 +145,11 @@ class PluginManager : public QObject {
 	/// Unloads the plugin with the given ID. Unloading means shutting the plugign down.
 	///
 	/// @param pluginID The ID of the plugin to unload
-	void unloadPlugin(plugin_id_t pluginID) const;
+	void unloadPlugin(plugin_id_t pluginID);
 	/// Unloads the given plugin. Unloading means shutting the plugign down.
 	///
 	/// @param plugin The plugin to unload
-	void unloadPlugin(Plugin &plugin) const;
+	void unloadPlugin(Plugin &plugin);
 	/// Clears the plugin from the list of known plugins
 	///
 	/// @param pluginID The ID of the plugin to forget about