diff --git a/src/controller/controller_storage.cpp b/src/controller/controller_storage.cpp
index c171b960..477e7b02 100644
--- a/src/controller/controller_storage.cpp
+++ b/src/controller/controller_storage.cpp
@@ -299,6 +299,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 137594f4..82c38271 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -42,6 +42,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