diff --git a/veejay-current/veejay-server/libsample/sampleadm.c b/veejay-current/veejay-server/libsample/sampleadm.c
index 4f78c4ec..27d6ffc6 100644
--- a/veejay-current/veejay-server/libsample/sampleadm.c
+++ b/veejay-current/veejay-server/libsample/sampleadm.c
@@ -2274,7 +2274,7 @@ int sample_chain_clear(int s1)
 		}
 	}
 	sample->effect_chain[i]->source_type = 0;
-	sample->effect_chain[i]->channel = 0;
+	sample->effect_chain[i]->channel = s1;
 	for (j = 0; j < SAMPLE_MAX_PARAMETERS; j++)
 	    sample->effect_chain[i]->arg[j] = 0;
     }
diff --git a/veejay-current/veejay-server/libstream/vj-tag.c b/veejay-current/veejay-server/libstream/vj-tag.c
index eefbbf11..3a4d138c 100644
--- a/veejay-current/veejay-server/libstream/vj-tag.c
+++ b/veejay-current/veejay-server/libstream/vj-tag.c
@@ -2714,8 +2714,8 @@ int vj_tag_chain_remove(int t1, int index)
 	
 	tag->effect_chain[index]->kf = vpn(VEVO_ANONYMOUS_PORT);
     
-	tag->effect_chain[index]->source_type = 0;
-	tag->effect_chain[index]->channel     = 0;
+    tag->effect_chain[index]->source_type = 1;
+    tag->effect_chain[index]->channel     = t1; //set to self
 
 	int j;
     for (j = 0; j < SAMPLE_MAX_PARAMETERS; j++)