diff --git a/daemon/core/api/grpc/server.py b/daemon/core/api/grpc/server.py
index 47615b29..842400ca 100644
--- a/daemon/core/api/grpc/server.py
+++ b/daemon/core/api/grpc/server.py
@@ -282,7 +282,8 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
 
         # session options
         for option in request.session.options.values():
-            session.options.set(option.name, option.value)
+            if option.value:
+                session.options.set(option.name, option.value)
         session.metadata = dict(request.session.metadata)
 
         # add servers