diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go
index 481d7e49d..bf94f14d6 100644
--- a/userapi/storage/shared/storage.go
+++ b/userapi/storage/shared/storage.go
@@ -644,7 +644,7 @@ func (d *Database) CreateDevice(
 			}
 		}
 	}
-	return
+	return dev, returnErr
 }
 
 // generateDeviceID creates a new device id. Returns an error if failed to generate