diff --git a/src/forms/SDRDevices/SDRDevices.cpp b/src/forms/SDRDevices/SDRDevices.cpp
index 814ac92..a5b767b 100644
--- a/src/forms/SDRDevices/SDRDevices.cpp
+++ b/src/forms/SDRDevices/SDRDevices.cpp
@@ -16,6 +16,7 @@ SDRDevicesDialog::SDRDevicesDialog( wxWindow* parent ): devFrame( parent ) {
     editId = nullptr;
     removeId = nullptr;
     devAddDialog = nullptr;
+    dev = nullptr;
 }
 
 void SDRDevicesDialog::OnClose( wxCloseEvent& event ) {
diff --git a/src/forms/SDRDevices/SDRDevices.h b/src/forms/SDRDevices/SDRDevices.h
index fd29880..333c56a 100644
--- a/src/forms/SDRDevices/SDRDevices.h
+++ b/src/forms/SDRDevices/SDRDevices.h
@@ -34,7 +34,7 @@ private:
     std::vector<SDRDeviceInfo *>::iterator devs_i;
     std::map<wxTreeItemId, SDRDeviceInfo *> devItems;
     std::map<wxTreeItemId, SDRDeviceInfo *>::iterator devItems_i;
-    SDRDeviceInfo *dev = NULL;
+    SDRDeviceInfo *dev;
     std::vector<wxPGProperty *> props;
     std::map<std::string, wxPGProperty *> devSettings;
     wxTreeItemId selId;