--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -1882,7 +1882,7 @@
 #endif
 									}
 									else {
-										cDevice::SetCurrentChannel(CurrentChannel);
+										cDevice::SetCurrentChannel(CurrentChannel->Number());
 									}
 								}
 								isyslog("channel %d moved to %d", FromNumber, ToNumber);
@@ -1983,7 +1983,7 @@
 							Channels.SwitchTo(CurrentChannel->Number());
 #endif
 						else
-							cDevice::SetCurrentChannel(CurrentChannel);
+							cDevice::SetCurrentChannel(CurrentChannel->Number());
 					}
 					Reply(250, "Channel \"%s\" deleted", Option);
 				}