diff --git a/Dockerfile b/Dockerfile
index 7efa81ea7fa..da01e89b6ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -74,3 +74,4 @@ VOLUME $IPFS_PATH
 # 1. There's an fs-repo, and initializes one if there isn't.
 # 2. The API and Gateway are accessible from outside the container.
 ENTRYPOINT ["/usr/local/bin/start_ipfs"]
+CMD ["daemon"]
diff --git a/Dockerfile.fast b/Dockerfile.fast
index 0993920b3a7..24bec6d6bc4 100644
--- a/Dockerfile.fast
+++ b/Dockerfile.fast
@@ -53,3 +53,4 @@ RUN cd $SRC_PATH \
 USER ipfs
 VOLUME $IPFS_PATH
 ENTRYPOINT ["/usr/local/bin/start_ipfs"]
+CMD ["daemon"]
diff --git a/bin/container_daemon b/bin/container_daemon
index fd939338ff9..1a84cd00045 100644
--- a/bin/container_daemon
+++ b/bin/container_daemon
@@ -19,4 +19,4 @@ else
   ipfs config Addresses.Gateway /ip4/0.0.0.0/tcp/8080
 fi
 
-exec ipfs daemon "$@"
+exec ipfs "$@"