diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java
index 133ecd7c8..81577b572 100644
--- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java
+++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ERP1Message.java
@@ -108,11 +108,12 @@ public class ERP1Message extends BasePacket {
                     }
                     break;
                 case SIG:
+                case MSC:
                     teachIn = false;
                     senderId = Arrays.copyOfRange(payload, dataLength - 5, dataLength - 1);
                     break;
                 default:
-                    break;
+                    rorg = RORG.Unknown;
             }
 
         } catch (Exception e) {