diff --git a/src/audiofilterer.cpp b/src/audiofilterer.cpp
index f88ae875b..2253a6f60 100644
--- a/src/audiofilterer.cpp
+++ b/src/audiofilterer.cpp
@@ -32,6 +32,7 @@ void AudioFilterer::closeFilter()
 {
     if (filter)
         kill_filter_audio(filter);
+    filter = nullptr;
 }
 
 
diff --git a/src/coreav.cpp b/src/coreav.cpp
index 41d0fe490..5fb12e128 100644
--- a/src/coreav.cpp
+++ b/src/coreav.cpp
@@ -81,8 +81,7 @@ void Core::prepareCall(int friendId, int callId, ToxAv* toxav, bool videoEnabled
     }
     else
     {
-        if (filterer[callId])
-            delete filterer[callId];
+        delete filterer[callId];
         filterer[callId] = nullptr;
     }
 #endif
diff --git a/src/misc/settings.cpp b/src/misc/settings.cpp
index 5ec16448a..ad2c9fbb3 100644
--- a/src/misc/settings.cpp
+++ b/src/misc/settings.cpp
@@ -900,11 +900,13 @@ void Settings::setOutDev(const QString& deviceSpecifier)
     outDev = deviceSpecifier;
 }
 
-bool Settings::getFilterAudio() const{
+bool Settings::getFilterAudio() const
+{
     return filterAudio;
 }
 
-void Settings::setFilterAudio(bool newValue){
+void Settings::setFilterAudio(bool newValue)
+{
     filterAudio = newValue;
 }
 
diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp
index 903fc7e6a..31f9b6dd9 100644
--- a/src/widget/form/settings/avform.cpp
+++ b/src/widget/form/settings/avform.cpp
@@ -197,6 +197,7 @@ void AVForm::onOutDevChanged(const QString& deviceDescriptor)
     Audio::openOutput(deviceDescriptor);
 }
 
-void AVForm::onFilterAudioToggled(bool filterAudio){
+void AVForm::onFilterAudioToggled(bool filterAudio)
+{
     Settings::getInstance().setFilterAudio(filterAudio);
 }