diff --git a/src/controller/controller_storage.cpp b/src/controller/controller_storage.cpp
index 52cf9d9d..7e201441 100644
--- a/src/controller/controller_storage.cpp
+++ b/src/controller/controller_storage.cpp
@@ -331,6 +331,7 @@ namespace Controller{
   void writeConfig(){
     writeProtocols();
     jsonForEach(Storage["streams"], it){
+      it->removeNullMembers();
       writeStream(it.key(), *it);
     }
 
diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp
index 0febaeb5..909fbbb5 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -45,6 +45,7 @@ namespace Controller {
     std::string prevState = data["error"].asStringRef();
     data["online"] = (std::string)"Checking...";
     data.removeMember("error");
+    data.removeNullMembers();
     switch (Util::getStreamStatus(name)){
       case STRMSTAT_OFF:
         //Do nothing