diff --git a/dom0/misc/vm-template-hvm.conf b/dom0/misc/vm-template-hvm.conf
index aae0f1b4..ca10840e 100644
--- a/dom0/misc/vm-template-hvm.conf
+++ b/dom0/misc/vm-template-hvm.conf
@@ -36,4 +36,4 @@ on_reboot   = 'destroy'
 on_crash    = 'destroy'
 
 # Use of DNS2 as DHCP server IP makes DNS2 not accessible, but DNS1 still should work
-device_model_args = [ '-net', 'lwip,client_ip={ip},server_ip={dns2},dns={dns1},gw={gateway},netmask={netmask}' ]
+{disable_network}device_model_args = [ '-net', 'lwip,client_ip={ip},server_ip={dns2},dns={dns1},gw={gateway},netmask={netmask}' ]
diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 7603c166..6435ca62 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -923,6 +923,7 @@ class QubesVm(object):
             if self.netvm.qid != 0:
                 args['netdev'] += ",backend={0}".format(self.netvm.name)
             args['netdev'] += "'"
+            args['disable_network'] = '';
         else:
             args['ip'] = ''
             args['mac'] = ''
@@ -931,6 +932,7 @@ class QubesVm(object):
             args['dns2'] = ''
             args['netmask'] = ''
             args['netdev'] = ''
+            args['disable_network'] = '#';
         args['rootdev'] = self.get_rootdev(source_template=source_template)
         args['privatedev'] = "'script:file:{dir}/private.img,xvdb,w',".format(dir=self.dir_path)
         args['volatiledev'] = "'script:file:{dir}/volatile.img,xvdc,w',".format(dir=self.dir_path)