diff --git a/device/raspivid/raspivid.go b/device/raspivid/raspivid.go
index d6311825..ae77d8e2 100644
--- a/device/raspivid/raspivid.go
+++ b/device/raspivid/raspivid.go
@@ -305,6 +305,9 @@ func (r *Raspivid) Read(p []byte) (int, error) {
 
 // Stop will terminate the raspivid process and close the output pipe.
 func (r *Raspivid) Stop() error {
+	if r.isRunning == false {
+		return nil
+	}
 	close(r.done)
 	if r.cmd == nil || r.cmd.Process == nil {
 		return errors.New("raspivid process was never started")