diff --git a/communication/decoder.cpp b/communication/decoder.cpp
index 802316a..4cbe7b3 100644
--- a/communication/decoder.cpp
+++ b/communication/decoder.cpp
@@ -157,12 +157,6 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					result = frResult;
 					return true;
 				}
-				default:
-					break;//return false;
-			}
-		}
-		default:
-			switch(packet->network.getNetID()) {
 				case Network::NetID::Main51: {
 					switch((Command)packet->data[0]) {
 						case Command::RequestSerialNumber: {
@@ -242,7 +236,10 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
 					result = msg;
 					return true;
 				}
+				default:
+					break;
 			}
+		}
 	}
 
 	// For the moment other types of messages will automatically be decoded as raw messages
diff --git a/include/icsneo/communication/network.h b/include/icsneo/communication/network.h
index 381856d..5937144 100644
--- a/include/icsneo/communication/network.h
+++ b/include/icsneo/communication/network.h
@@ -263,10 +263,13 @@ public:
 			case NetID::MOST150:
 				return Type::MOST;
 			case NetID::RED:
+			case NetID::RED_OLDFORMAT:
 			case NetID::Device:
 			case NetID::Reset_Status:
 			case NetID::DeviceStatus:
 			case NetID::FlexRayControl:
+			case NetID::Main51:
+			case NetID::ReadSettings:
 				return Type::Internal;
 			case NetID::Invalid:
 			case NetID::Any: