diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 0976c846d..2c2aeb79d 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -96,13 +96,15 @@
 							<div class="col-lg-<?php echo $columns[2] ?>">
 								<div class="form-group">
 									<label>ZGV Datum: </label>
-									<?php if ($infoonly):
-										echo date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y');
+									<?php
+									$zgvdatum = empty($zgvpruefung->zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y');
+									if ($infoonly):
+										echo $zgvdatum;
 									else:
 										?>
 										<input type="text"
 											   class="dateinput form-control"
-											   value="<?php echo empty($zgvpruefung->zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y') ?>"
+											   value="<?php echo $zgvdatum ?>"
 											   name="zgvdatum" id="zgvdatum_<?php echo $zgvpruefung->prestudent_id ?>">
 									<?php endif; ?>
 								</div>
@@ -153,13 +155,15 @@
 								<div class="col-lg-<?php echo $columns[2] ?>">
 									<div class="form-group">
 										<label>ZGV Master Datum: </label>
-										<?php if ($infoonly):
-											echo date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y');
+										<?php
+										$zgvmadatum = empty($zgvpruefung->zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y');
+										if ($infoonly):
+											echo $zgvmadatum;
 										else:
 											?>
 											<input type="text"
 												   class="dateinput form-control"
-												   value="<?php echo empty($zgvpruefung->zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y') ?>"
+												   value="<?php echo $zgvmadatum ?>"
 												   name="zgvmadatum">
 										<?php endif; ?>
 									</div>