diff --git a/Modelica/Blocks/Discrete.mo b/Modelica/Blocks/Discrete.mo
index 32fae1db4e..ba583cf6c4 100644
--- a/Modelica/Blocks/Discrete.mo
+++ b/Modelica/Blocks/Discrete.mo
@@ -5,11 +5,11 @@ package Discrete
   extends Modelica.Icons.Package;
 
   block Sampler "Ideal sampling of continuous signals"
-    extends Interfaces.DiscreteSISO;
+    extends Interfaces.DiscreteSISO(y(start=0, fixed=true));
 
   equation
     when {sampleTrigger, initial()} then
-      y = u;
+      y = if time>=startTime then u else pre(y);
     end when;
     annotation (
       Icon(